Another build breakage on netbsd-5 (xf86-video-ati)

[Uwe Klaus <uklaus%hgb-leipzig.de@localhost>]

Hi,

the patch for xf86-video-ati
http://mail-index.netbsd.org/source-changes/2011/01/16/msg017344.html
breaks the build on netbsd-5

#   compile  xf86-video-radeon/radeon_exa_shared.so
/usr/src/../tools.amd64/bin/x86_64--netbsd-gcc -O2  -Werror  -Wno-error 
-fno-strict-aliasing   -DGLXEXT -DXF86DRI -DGLX_DIRECT_RENDERING 
-DGLX_USE_DLOPEN -DGLX_USE_MESA -DDISABLE_EASF 
-DENABLE_ALL_SERVICE_FUNCTIONS  -DATOM_BIOS -DATOM_BIOS_PARSER 
-DDRIVER_PARSER  -DHAVE_CONFIG_H 
-I/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/includes 
-I/usr/src/../obj.amd64/destdir.amd64/usr/X11R7/include/X11 
-I/usr/src/../obj.amd64/destdir.amd64/usr/X11R7/include/X11/dri 
-I/usr/src/../obj.amd64/destdir.amd64/usr/X11R7/include/drm 
-I/usr/src/../xsrc/external/mit/xf86-video-ati/dist/../include 
-DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO 
-I/usr/src/../obj.amd64/destdir.amd64/usr/X11R7/include -D__AMD64__ 
-I/usr/src/../obj.amd64/destdir.amd64/usr/X11R7/include/X11 
-I/usr/src/../obj.amd64/destdir.amd64/usr/X11R7/include/X11/dri 
-I/usr/src/../obj.amd64/destdir.amd64/usr/X11R7/include/drm 
-I/usr/src/../obj.amd64/destdir.amd64/usr/X11R7/include/xorg 
-I/usr/src/../obj.amd64/destdir.amd64/usr/X11R7/include/pixman-1 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/../include  -DMITMISC 
-DXTEST -DXTRAP -DXSYNC -DXCMISC  -DXRECORD -DMITSHM -DBIGREQS 
-DXF86VIDMODE  -DXF86MISC -DDPMSExtension -DEVI  -DSCREENSAVER -DXV -DXVMC 
-DGLXEXT  -DFONTCACHE -DRES  -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP 
-DXCSECURITY -DTOGCUP -DXF86BIGFONT  -DDPMSExtension -DPIXPRIV -DPANORAMIX 
-DRENDER -DRANDR -DXFIXES -DDAMAGE  -DCOMPOSITE -DXEVIE -DGLXEXT -DXF86DRI 
-DGLX_DIRECT_RENDERING  -DGLX_USE_DLOPEN -DGLX_USE_MESA -DXF86VIDMODE 
-D__GLX_ALIGN64  -DHAVE_DIX_CONFIG_H -D_BSD_SOURCE -DHAS_FCHOWN 
-DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS -I/freetype2 
-I/pixman-1  -I/usr/src/../xsrc/external/mit/xorg-server/dist/include 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/Xext 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/composite 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/damageext 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/xfixes 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/Xi 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/mi 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/miext/shadow 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/miext/damage 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/render 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/randr 
-I/usr/src/../xsrc/external/mit/xorg-server/dist/fb  -DSHAPE -DXKB -DLBX 
-DXAPPGROUP -DXCSECURITY  -DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV 
-DPANORAMIX -DRENDER -DRANDR -DGCCUSESGAS  -DAVOID_GLYPHBLT -DSINGLEDEPTH 
-DXvExtension  -DXFree86Server -DXvMCExtension -DSMART_SCHEDULE 
-DBUILDDEBUG -DXResExtension -DNDEBUG -DXINPUT -DXFreeXDGA -DXF86VIDMODE 
-D_XSERVER64  -DHAVE_XORG_SERVER_1_1_0  -DSERVER_1_5 
-DXSERVER_LIBPCIACCESS  -DXFree86LOADER -DPACKAGE_VERSION_MAJOR=6 
-DPACKAGE_VERSION_MINOR=13 -DPACKAGE_VERSION_PATCHLEVEL=2 
-DXORG_VERSION_CURRENT="(((1) * 10000000) + ((6) * 100000) + ((3) * 1000) 
+ 0)"   -nostdinc -isystem /usr/src/../obj.amd64/destdir.amd64/usr/include 
-c    -fPIC -DPIC 
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c 
-o radeon_exa_shared.so
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:285: 
error: redefinition of 'RADEONGetDrawablePixmap'
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:48: 
error: previous definition of 'RADEONGetDrawablePixmap' was here
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:293: 
error: redefinition of 'RADEONVlineHelperClear'
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:56: 
error: previous definition of 'RADEONVlineHelperClear' was here
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:303: 
error: redefinition of 'RADEONVlineHelperSet'
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:66: 
error: previous definition of 'RADEONVlineHelperSet' was here
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:317: 
error: redefinition of 'RADEONValidPM'
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:80: 
error: previous definition of 'RADEONValidPM' was here
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:354: 
error: redefinition of 'RADEONCheckBPP'
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:117: 
error: previous definition of 'RADEONCheckBPP' was here
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:367: 
error: redefinition of 'radeon_vb_get'
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:130: 
error: previous definition of 'radeon_vb_get' was here
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:382: 
error: redefinition of 'radeon_vb_discard'
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:145: 
error: previous definition of 'radeon_vb_discard' was here
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:389: 
error: redefinition of 'radeon_cp_start'
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:152: 
error: previous definition of 'radeon_cp_start' was here
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:413: 
error: redefinition of 'radeon_vb_no_space'
/usr/src/../xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c:176: 
error: previous definition of 'radeon_vb_no_space' was here

*** Failed target:  radeon_exa_shared.so


Best regards,
uwe