Permalink
Browse files

Fix for the Windows builds

git-svn-id: http://svn.osgeo.org/mapserver/trunk@12923 7532c77e-422f-0410-93f4-f0b67bdd69e2
  • Loading branch information...
1 parent 4dedf9a commit ba3044c6b3f574f0a340972c2bd8263d07c17dbd @szekerest szekerest committed Dec 26, 2011
Showing with 8 additions and 7 deletions.
  1. +1 −1 Makefile.vc
  2. +4 −4 mapserv.h
  3. +3 −2 mapservutil.c
View
@@ -48,7 +48,7 @@ MS_OBJS = mapbits.obj maphash.obj mapshape.obj mapxbase.obj \
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
View
@@ -61,9 +61,9 @@ static char *modeStrings[21] = {"BROWSE","ZOOMIN","ZOOMOUT","MAP","LEGEND","LEGE
"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 msCGIDispatchQueryRequest(mapservObj *mapserv);
int msCGIDispatchImageRequest(mapservObj *mapserv);
int msCGIDispatchLegendRequest(mapservObj *mapserv);
int msCGIDispatchLegendIconRequest(mapservObj *mapserv);
-int msCGIDispatchRequest(mapservObj *mapserv);
+MS_DLL_EXPORT int msCGIDispatchRequest(mapservObj *mapserv);
View
@@ -1680,6 +1680,8 @@ int msCGIHandler(const char *query_string, void **out_buffer, size_t *buffer_len
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 @@ int msCGIHandler(const char *query_string, void **out_buffer, size_t *buffer_len
(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;

0 comments on commit ba3044c

Please sign in to comment.