[Xorg] Build failure for mkfontscale.c?

[Deron Johnson]

While trying to compile the latest xorg cvs head, I get the following 
build error. I got this when I did a fresh checkout (around 6:00
last night) and also after I did a cvs update -d this morning.

gcc -m32 -O2 -fno-strength-reduce -fno-strict-aliasing -ansi -pedantic 
-Wall -Wpointer-arith -Wundef   -I/usr/include/freetype2 
-I/usr/include/freetype2/config  -I../../exports/include/X11  -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   -DFREETYPE2 
-DXFREE86_FT2    -c -o mkfontscale.o mkfontscale.c
mkfontscale.c: In function `doDirectory':
mkfontscale.c:858: `BDF_PropertyRec' undeclared (first use in this function)
mkfontscale.c:858: (Each undeclared identifier is reported only once
mkfontscale.c:858: for each function it appears in.)
mkfontscale.c:858: parse error before "prop"
mkfontscale.c:859: warning: implicit declaration of function 
`FT_Get_BDF_Property'
mkfontscale.c:859: `prop' undeclared (first use in this function)
mkfontscale.c:860: `BDF_PROPERTY_TYPE_ATOM' undeclared (first use in 
this function)