[mapserver-commits] r12923 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-12-26 14:54:24 -0800 (Mon, 26 Dec 2011)
New Revision: 12923

Modified:
   trunk/mapserver/Makefile.vc
   trunk/mapserver/mapserv.h
   trunk/mapserver/mapservutil.c
Log:
Fix for the Windows builds

Modified: trunk/mapserver/Makefile.vc
===================================================================
--- trunk/mapserver/Makefile.vc	2011-12-26 12:47:54 UTC (rev 12922)
+++ trunk/mapserver/Makefile.vc	2011-12-26 22:54:24 UTC (rev 12923)
@@ -48,7 +48,7 @@
 		mapoglrenderer.obj mapoglcontext.obj mapogl.obj \
 		maptile.obj $(EPPL_OBJ) $(REGEX_OBJ) mapgeomtransform.obj mapunion.obj \
                 mapkmlrenderer.obj mapkml.obj mapdummyrenderer.obj mapgeomutil.obj mapquantization.obj \
-                mapogcfiltercommon.obj mapcluster.obj mapuvraster.obj $(AGG_OBJ)
+                mapogcfiltercommon.obj mapcluster.obj mapuvraster.obj mapservutil.obj $(AGG_OBJ)
 
 MS_HDRS = 	mapserver.h mapfile.h
 

Modified: trunk/mapserver/mapserv.h
===================================================================
--- trunk/mapserver/mapserv.h	2011-12-26 12:47:54 UTC (rev 12922)
+++ trunk/mapserver/mapserv.h	2011-12-26 22:54:24 UTC (rev 12923)
@@ -61,9 +61,9 @@
 				"FEATUREQUERY","FEATURENQUERY","ITEMFEATUREQUERY","ITEMFEATURENQUERY",
 				"INDEXQUERY","TILE","OWS", "WFS"};
 
-int msCGIWriteLog(mapservObj *mapserv, int show_error);
-void msCGIWriteError(mapservObj *mapserv);
-mapObj *msCGILoadMap(mapservObj *mapserv);
+MS_DLL_EXPORT int msCGIWriteLog(mapservObj *mapserv, int show_error);
+MS_DLL_EXPORT void msCGIWriteError(mapservObj *mapserv);
+MS_DLL_EXPORT mapObj *msCGILoadMap(mapservObj *mapserv);
 int msCGISetMode(mapservObj *mapserv);
 int msCGILoadForm(mapservObj *mapserv);
 int msCGIDispatchBrowseRequest(mapservObj *mapserv);
@@ -72,7 +72,7 @@
 int msCGIDispatchImageRequest(mapservObj *mapserv);
 int msCGIDispatchLegendRequest(mapservObj *mapserv);
 int msCGIDispatchLegendIconRequest(mapservObj *mapserv);
-int msCGIDispatchRequest(mapservObj *mapserv);
+MS_DLL_EXPORT int msCGIDispatchRequest(mapservObj *mapserv);
 
 
 

Modified: trunk/mapserver/mapservutil.c
===================================================================
--- trunk/mapserver/mapservutil.c	2011-12-26 12:47:54 UTC (rev 12922)
+++ trunk/mapserver/mapservutil.c	2011-12-26 22:54:24 UTC (rev 12923)
@@ -1680,6 +1680,8 @@
    mapservObj* mapserv = NULL;
    char *queryString;
    int maxParams = MS_DEFAULT_CGI_PARAMS;
+   msIOContext *ctx;
+   msIOBuffer  *buf;
 
    msIO_installStdoutToBuffer();
    /* Use MS_ERRORFILE and MS_DEBUGLEVEL env vars if set */
@@ -1765,8 +1767,7 @@
             (execendtime.tv_sec+execendtime.tv_usec/1.0e6)-
             (execstarttime.tv_sec+execstarttime.tv_usec/1.0e6) );
    }
-   msIOContext *ctx = msIO_getHandler( (FILE *) "stdout" );
-   msIOBuffer  *buf;
+   ctx = msIO_getHandler( (FILE *) "stdout" );
    buf = (msIOBuffer *) ctx->cbData;
    *out_buffer = buf->data;
    *buffer_length = buf->data_offset;