[mapserver-dev] git master does not compile

[Stephen Woodbridge]

Hi Devs,

I just updated git master and it does not compile for me. Dies with the 
following. Any ideas?

Thanks,
   -Steve

/bin/sh ./libtool --mode=compile --tag=CC gcc -c -g  -Wall 
-DIGNORE_MISSING_DATA  -DUSE_SVG_CAIRO -DUSE_CAIRO -DUSE_FRIBIDI 
-DUSE_WMS_LYR   -DUSE_LIBXML2 -DUSE_CURL -DUSE_CURLOPT_PROXYAUTH 
-DUSE_WFS_SVR -DUSE_WMS_SVR   -DUSE_POSTGIS -DPOSTGIS_HAS_SERVER_VERSION 
-DUSE_GDAL -DUSE_OGR -DUSE_GEOS   -DUSE_PROJ   -DUSE_GD  -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_ICONV -DUSE_JPEG -DUSE_GIF -DUSE_PNG 
-DUSE_ZLIB -DUSE_FREETYPE -DHAVE_VSNPRINTF -DNEED_STRLCPY -DNEED_STRLCAT 
-DNEED_STRRSTR   -DDISABLE_CVSID  -I/usr/include/freetype2 
-Irenderers/agg/include   -I/usr/include   -I/usr/local/include/gdal 
-I/usr/include/postgresql    -I/usr/include     -I/usr/include/libxml2 
-I/usr/local/include -D_REENTRANT -I/usr/include/cairo 
-I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 
-I/usr/include/pixman-1   -D_REENTRANT -I/usr/local/include 
-I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb 
-I/usr/include/libpng12 -I/usr/include/pixman-1     mapio.c -o mapio.lo
libtool: compile:  gcc -c -g -Wall -DIGNORE_MISSING_DATA -DUSE_SVG_CAIRO 
-DUSE_CAIRO -DUSE_FRIBIDI -DUSE_WMS_LYR -DUSE_LIBXML2 -DUSE_CURL 
-DUSE_CURLOPT_PROXYAUTH -DUSE_WFS_SVR -DUSE_WMS_SVR -DUSE_POSTGIS 
-DPOSTGIS_HAS_SERVER_VERSION -DUSE_GDAL -DUSE_OGR -DUSE_GEOS -DUSE_PROJ 
-DUSE_GD -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_ICONV 
-DUSE_JPEG -DUSE_GIF -DUSE_PNG -DUSE_ZLIB -DUSE_FREETYPE 
-DHAVE_VSNPRINTF -DNEED_STRLCPY -DNEED_STRLCAT -DNEED_STRRSTR 
-DDISABLE_CVSID -I/usr/include/freetype2 -Irenderers/agg/include 
-I/usr/include -I/usr/local/include/gdal -I/usr/include/postgresql 
-I/usr/include -I/usr/include/libxml2 -I/usr/local/include -D_REENTRANT 
-I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb 
-I/usr/include/libpng12 -I/usr/include/pixman-1 -D_REENTRANT 
-I/usr/local/include -I/usr/include/cairo -I/usr/include/freetype2 
-I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 
mapio.c  -fPIC -DPIC -o .libs/mapio.o
mapio.c: In function 'msIO_gd_putC':
mapio.c:570: error: 'msIO_gdIOCtx' undeclared (first use in this function)
mapio.c:570: error: (Each undeclared identifier is reported only once
mapio.c:570: error: for each function it appears in.)
mapio.c:570: error: 'merged_context' undeclared (first use in this function)
mapio.c:570: error: expected expression before ')' token
mapio.c: In function 'msIO_gd_putBuf':
mapio.c:586: error: 'msIO_gdIOCtx' undeclared (first use in this function)
mapio.c:586: error: 'merged_context' undeclared (first use in this function)
mapio.c:586: error: expected expression before ')' token
mapio.c: In function 'msIO_getGDIOCtx':
mapio.c:603: error: 'msIO_gdIOCtx' undeclared (first use in this function)
mapio.c:603: error: 'merged_context' undeclared (first use in this function)
mapio.c:615: warning: control reaches end of non-void function
make: *** [mapio.lo] Error 1