mapunion.c compile error on FreeBSD

[wenheping]

Hi,

Mapserver-6.0.0 compile error on FreeBSD , below is build log:

.... c -c -O2 -pipe -fno-strict-aliasing -fPIC -Wall -DNDEBUG -DHAVE_VSNPRINTF -DNEED_STRRSTR -DUSE_WMS_SVR -DUSE_PROJ -DUSE_GD_GIF -DUSE_GD_PNG -DUSE_GD_JPEG -DUSE_GD_WBMP -DUSE_GD_FT -DGD_HAS_FTEX_XSHOW -DGD_HAS_GDIMAGEGIFPTR -DGD_HAS_GETBITMAPFONTS -DGD_HAS_GET_TRUE_COLOR_PIXEL -DUSE_GIF -DUSE_PNG -DUSE_ZLIB -DUSE_FREETYPE -DDISABLE_CVSID -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include -Irenderers/agg/include -I/usr/local/include mapogroutput.c -o mapogroutput.o

cc -c -O2 -pipe -fno-strict-aliasing -fPIC -Wall -DNDEBUG -DHAVE_VSNPRINTF -DNEED_STRRSTR -DUSE_WMS_SVR -DUSE_PROJ -DUSE_GD_GIF -DUSE_GD_PNG -DUSE_GD_JPEG -DUSE_GD_WBMP -DUSE_GD_FT -DGD_HAS_FTEX_XSHOW -DGD_HAS_GDIMAGEGIFPTR -DGD_HAS_GETBITMAPFONTS -DGD_HAS_GET_TRUE_COLOR_PIXEL -DUSE_GIF -DUSE_PNG -DUSE_ZLIB -DUSE_FREETYPE -DDISABLE_CVSID -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include -Irenderers/agg/include -I/usr/local/include mapwcs20.c -o mapwcs20.o cc -c -O2 -pipe -fno-strict-aliasing -fPIC -Wall -DNDEBUG -DHAVE_VSNPRINTF -DNEED_STRRSTR -DUSE_WMS_SVR -DUSE_PROJ -DUSE_GD_GIF -DUSE_GD_PNG -DUSE_GD_JPEG -DUSE_GD_WBMP -DUSE_GD_FT -DGD_HAS_FTEX_XSHOW -DGD_HAS_GDIMAGEGIFPTR -DGD_HAS_GETBITMAPFONTS -DGD_HAS_GET_TRUE_COLOR_PIXEL -DUSE_GIF -DUSE_PNG -DUSE_ZLIB -DUSE_FREETYPE -DDISABLE_CVSID -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include -Irenderers/agg/include -I/usr/local/include mapogcfiltercommon.c -o mapogcfiltercommon.o cc -c -O2 -pipe -fno-strict-aliasing -fPIC -Wall -DNDEBUG -DHAVE_VSNPRINTF -DNEED_STRRSTR -DUSE_WMS_SVR -DUSE_PROJ -DUSE_GD_GIF -DUSE_GD_PNG -DUSE_GD_JPEG -DUSE_GD_WBMP -DUSE_GD_FT -DGD_HAS_FTEX_XSHOW -DGD_HAS_GDIMAGEGIFPTR -DGD_HAS_GETBITMAPFONTS -DGD_HAS_GET_TRUE_COLOR_PIXEL -DUSE_GIF -DUSE_PNG -DUSE_ZLIB -DUSE_FREETYPE -DDISABLE_CVSID -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include -Irenderers/agg/include -I/usr/local/include mapunion.c -o mapunion.o mapunion.c: In function 'msUnionLayerOpen': mapunion.c:135: warning: assignment from incompatible pointer type mapunion.c: In function 'msUnionLayerInitItemInfo': mapunion.c:257: warning: unused variable 'j' mapunion.c: In function 'msUnionLayerWhichShapes': mapunion.c:352: error: 'FALSE' undeclared (first use in this function) mapunion.c:352: error: (Each undeclared identifier is reported only once mapunion.c:352: error: for each function it appears in.) gmake: * [mapunion.o] Error 1 * Error code 1

Here shall I replace TRUE with MS_TRUE ?

wen

[tamas]

fixed in trunk (r11713) and branch-6-0 (r11714)