Bug detailed description:
-------------------------
It is ok to compile xserver 1.4 branch with mesa 7.0.3.
compile xerver 1.5 branch with mesa 7.0.3 will get following errors:

(cd .libs && rm -f libglx.la && ln -s ../libglx.la libglx.la)
if /bin/sh ../../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I../../include -I../../include -I../../include -I../../include -I../../include -I../../include -I../../include -I../../include -I../../hw/xfree86/os-support -I../../hw/xfree86/os-support/bus -I../../hw/xfree86/common -I../../hw/xfree86/dri -I../../hw/xfree86/dri2 -I../../mi   -I/GFX/build/component/Mesa/mesa/include -DHAVE_DIX_CONFIG_H -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -I/opt/X11R7/include -I/usr/include/freetype2 -I/opt/X11R7/include/pixman-1   -I/usr/kerberos/include   -I../../include -I../../include -I../../Xext -I../../composite -I../../damageext -I../../xfixes -I../../Xi -I../../mi -I../../miext/shadow  -I../../miext/damage -I../../render -I../../randr -I../../fb -I/opt/X11R7/include -I/opt/X11R7/include -I/opt/X11R7/include -I/opt/X11R7/include/drm -I/opt/X11R7/include/X11/dri -I/GFX/build/component/Mesa/mesa/src/mesa/glapi -I/GFX/build/component/Mesa/mesa/src/mesa/main -DXFree86Server  -g -O2 -MT glxdri.lo -MD -MP -MF ".deps/glxdri.Tpo" -c -o glxdri.lo glxdri.c; \
then mv -f ".deps/glxdri.Tpo" ".deps/glxdri.Plo"; else rm -f ".deps/glxdri.Tpo"; exit 1; fi
 gcc -DHAVE_CONFIG_H -I. -I. -I../../include -I../../include -I../../include -I../../include -I../../include -I../../include -I../../include -I../../include -I../../hw/xfree86/os-support -I../../hw/xfree86/os-support/bus -I../../hw/xfree86/common -I../../hw/xfree86/dri -I../../hw/xfree86/dri2 -I../../mi -I/GFX/build/component/Mesa/mesa/include -DHAVE_DIX_CONFIG_H -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -I/opt/X11R7/include -I/usr/include/freetype2 -I/opt/X11R7/include/pixman-1 -I/usr/kerberos/include -I../../include -I../../include -I../../Xext -I../../composite -I../../damageext -I../../xfixes -I../../Xi -I../../mi -I../../miext/shadow -I../../miext/damage -I../../render -I../../randr -I../../fb -I/opt/X11R7/include -I/opt/X11R7/include -I/opt/X11R7/include -I/opt/X11R7/include/drm -I/opt/X11R7/include/X11/dri -I/GFX/build/component/Mesa/mesa/src/mesa/glapi -I/GFX/build/component/Mesa/mesa/src/mesa/main -DXFree86Server -g -O2 -MT glxdri.lo -MD -MP -MF .deps/glxdri.Tpo -c glxdri.c  -fPIC -DPIC -o .libs/glxdri.o
glxdri.c:76: error: expected ':', ',', ';', '}' or '__attribute__' before '*' token
glxdri.c:113: error: expected specifier-qualifier-list before '__DRIconfig'
glxdri.c: In function '__glXDRIleaveServer':
glxdri.c:124: error: '__GLXDRIscreen' has no member named 'lastTexOffsetOverride'
glxdri.c:127: error: '__GLXDRIscreen' has no member named 'texOffsetOverride'
glxdri.c:133: error: '__GLXDRIdrawable' has no member named 'texname'
glxdri.c:134: error: '__GLXDRIdrawable' has no member named 'offset'
glxdri.c:135: error: '__GLXDRIscreen' has no member named 'texOffsetStart'
glxdri.c:146: error: '__GLXDRIscreen' has no member named 'lastTexOffsetOverride'
glxdri.c:149: error: '__GLXDRIscreen' has no member named 'texOffsetOverride'
glxdri.c:155: error: '__GLXDRIdrawable' has no member named 'texname'
glxdri.c:156: error: '__GLXDRIscreen' has no member named 'texOffset'
glxdri.c:156: error: '__GLXDRIdrawable' has no member named 'ctx'
glxdri.c:157: error: '__GLXDRIdrawable' has no member named 'texname'
glxdri.c:158: error: '__GLXDRIdrawable' has no member named 'offset'
glxdri.c: In function '__glXDRIenterServer':
glxdri.c:176: error: '__GLXDRIscreen' has no member named 'lastTexOffsetOverride'
glxdri.c: In function '__glXDRIdoReleaseTexImage':
glxdri.c:189: error: '__GLXDRIscreen' has no member named 'lastTexOffsetOverride'



Reproduce steps:
----------------
1. get mesa 7.0.3 code
2. get xserver 1.5 branch
3. compile xserver with mesa 7.0.3


Expected result:
----------------
should compile successfully