Build error in current cvs.

[Ivan Leo Murray-Smith]

After a cvs update, there is this lovely build error, while building gdi, is it
a problem with the recent gdi patches that have just got in or am I doing
something wrong?

make[2]: Entering directory `/home/ivan/Development/Wine/CVS/wine/dlls/gdi'
../../tools/winebuild/winebuild -D__WINESRC__ -D_GDI32_ -o dispdib.spec.c
--main-module gdi32.dll --spec dispdib.spec
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o dispdib.spec.o dispdib.spec.c
../../tools/winebuild/winebuild -D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -o
gdi.exe.spec.c --heap 65520 --main-module gdi32.dll --res version16.res --spec
./gdi.exe.spec
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o gdi.exe.spec.o gdi.exe.spec.c
../../tools/winebuild/winebuild -D__WINESRC__ -D_GDI32_ -o wing.spec.c
--main-module gdi32.dll --spec wing.spec
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o wing.spec.o wing.spec.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o bidi16.o bidi16.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o gdi16.o gdi16.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o wing.o wing.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../graphics/bitblt.o ../../graphics/bitblt.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../graphics/dispdib.o ../../graphics/dispdib.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../graphics/env.o ../../graphics/env.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../graphics/escape.o ../../graphics/escape.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../graphics/fontengine.o ../../graphics/fontengine.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../graphics/mapping.o ../../graphics/mapping.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../graphics/painting.o ../../graphics/painting.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../graphics/path.o ../../graphics/path.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/bitmap.o ../../objects/bitmap.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/brush.o ../../objects/brush.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/clipping.o ../../objects/clipping.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/dc.o ../../objects/dc.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/dcvalues.o ../../objects/dcvalues.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/dib.o ../../objects/dib.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/enhmetafile.o ../../objects/enhmetafile.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/font.o ../../objects/font.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/gdiobj.o ../../objects/gdiobj.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/metafile.o ../../objects/metafile.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/palette.o ../../objects/palette.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/pen.o ../../objects/pen.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/region.o ../../objects/region.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o ../../objects/text.o ../../objects/text.c
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2
-D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe
-mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g
-O2 -o bidi.o bidi.c
bidi.c: In function `BIDI_Reorder':
bidi.c:75: error: `WINE_GCPW_DIR_MASK' undeclared (first use in this function)
bidi.c:75: error: (Each undeclared identifier is reported only once
bidi.c:75: error: for each function it appears in.)
bidi.c:77: error: `WINE_GCPW_FORCE_LTR' undeclared (first use in this function)
bidi.c:80: error: `WINE_GCPW_FORCE_RTL' undeclared (first use in this function)
bidi.c:83: error: `WINE_GCPW_LOOSE_LTR' undeclared (first use in this function)
bidi.c:86: error: `WINE_GCPW_LOOSE_RTL' undeclared (first use in this function)
make[2]: *** [bidi.o] Error 1
make[2]: Leaving directory `/home/ivan/Development/Wine/CVS/wine/dlls/gdi'
make[1]: *** [gdi] Error 2
make[1]: Leaving directory `/home/ivan/Development/Wine/CVS/wine/dlls'
make: *** [dlls] Error 2
[ivan at localhost wine]$