[Xorg] cvs compile errors

[Alex Deucher]

FYI looks like freetype is broken in cvs:

gcc -m32 -c -ansi -pedantic -Wall -Wpointer-arith -Wundef 
-I/usr/include/freetype2 -I/usr/include/freetype2/config -I.
-I../../../include/fonts -I../include -I../../../exports/include/X11  
         -I../../../programs/Xserver/include
        -I../../../exports/include  -I../../..
-I../../../exports/include   -Dlinux -D__i386__
-D_POSIX_C_SOURCE=199309L                               
-D_POSIX_SOURCE -D_XOPEN_SOURCE                                
-D_BSD_SOURCE -D_SVID_SOURCE                             -D_GNU_SOURCE
                           -DFUNCPROTO=15 -DNARROWPROTO   -DGCCUSESGAS
-DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXFreeXDGA -DXvExtension    
                           -DXFree86LOADER  -DXFree86Server           
                    -DXF86VIDMODE                         
-DXvMCExtension                          -DSMART_SCHEDULE             
         -DBUILDDEBUG -DXResExtension                            
-DX_BYTE_ORDER=X_LITTLE_ENDIAN                         
-DXORG_VERSION_CURRENT="(((6) * 10000000) + ((7) * 100000) + ((0) *
1000) + 0)"           -DXFREE86_FT2         -O2 -fno-strength-reduce
-fno-strict-aliasing   ftfuncs.c -o unshared/ftfuncs.o
ftfuncs.c: In function `FT_Do_SBit_Metrics':
ftfuncs.c:931: error: structure has no member named `find_sbit_image'
ftfuncs.c:955: error: structure has no member named `load_sbit_metrics'
make[5]: *** [ftfuncs.o] Error 1
make[5]: Leaving directory `/home/alex/cvs/xorg/xc/lib/font/FreeType'
make[4]: *** [FreeType] Error 2
make[4]: Leaving directory `/home/alex/cvs/xorg/xc/lib/font'
make[3]: *** [all] Error 2
make[3]: Leaving directory `/home/alex/cvs/xorg/xc/lib'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/home/alex/cvs/xorg/xc'
make[1]: *** [World] Error 2
make[1]: Leaving directory `/home/alex/cvs/xorg/xc'
make: *** [World] Error 2