f86-video-intel-1.9.9.2 build problem

[Ken Mandelberg]

f86-video-intel-1.9.9.1 built properly for me, but 1.9.9.2 is giving me 
trouble.

Specifically

gcc -DHAVE_CONFIG_H -I. -I. -I.. -Wall -Wpointer-arith 
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations 
-Wnested-externs -fno-strict-aliasing -I/usr/include/xorg 
-I/usr/include/drm -I/usr/include/X11/dri -DXF86_MODES_RENAME 
-I../src/modes -I../src/parser -DI830_XV -DI830_USE_XAA -DI830_USE_EXA 
-g -O2 -MT i830_driver.lo -MD -MP -MF .deps/i830_driver.Tpo -c 
i830_driver.c  -fPIC -DPIC -o .libs/i830_driver.o

fails, with

i830_driver.c: In function 'I830PreInit':
i830_driver.c:1521: error: invalid storage class for function 'ResetState'
i830_driver.c:1521: warning: no previous prototype for 'ResetState'
i830_driver.c:1573: error: invalid storage class for function 'SetFenceRegs'
.....

it appears that one of the ifdef's is being excluded, and there is an 
extra "{" in I830PreInit without it, so that 830PreInit runs past its 
last brace.

This is on Suse 10.2 running against a server  7.1.99.902 (7.2.0 RC 2), 
and for configure --with-xserver-source points to the src tree for that 
server release.