[mapserver-commits] r10682 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-10-28 17:29:11 -0700 (Thu, 28 Oct 2010)
New Revision: 10682

Modified:
   trunk/mapserver/mapfile.c
   trunk/mapserver/mapogcfilter.c
Log:
Correct windows build (#3537)

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2010-10-28 21:34:50 UTC (rev 10681)
+++ trunk/mapserver/mapfile.c	2010-10-29 00:29:11 UTC (rev 10682)
@@ -1992,13 +1992,14 @@
 {
   if(exp->string) {
     char *exprstring;
+    size_t buffer_size;
     const char *case_insensitive = "";
 
     if(exp->flags & MS_EXP_INSENSITIVE)
       case_insensitive = "i";
 
     /* Alloc buffer big enough for string + 2 delimiters + 'i' + \0 */
-    size_t buffer_size = strlen(exp->string)+4;
+    buffer_size = strlen(exp->string)+4;
     exprstring = (char*)malloc(buffer_size);
 
     switch(exp->type) {

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2010-10-28 21:34:50 UTC (rev 10681)
+++ trunk/mapserver/mapogcfilter.c	2010-10-29 00:29:11 UTC (rev 10682)
@@ -168,8 +168,9 @@
         tokens = msStringSplit(pszEpsg,'#', &nTokens);
         if (tokens && nTokens == 2)
         {
+            char *szTmp;
             bufferSize = 10+strlen(tokens[1])+1;
-            char *szTmp = (char *)malloc(bufferSize);
+            szTmp = (char *)malloc(bufferSize);
             snprintf(szTmp, bufferSize, "init=epsg:%s", tokens[1]);
             msInitProjection(psProj);
             if (msLoadProjectionString(psProj, szTmp) == 0)
@@ -987,8 +988,9 @@
         tokens = msStringSplit(szEPSG,'#', &nTokens);
         if (tokens && nTokens == 2)
         {
+            char *szTmp;
             bufferSize = 10+strlen(tokens[1])+1;
-            char *szTmp = (char *)malloc(bufferSize);
+            szTmp = (char *)malloc(bufferSize);
             snprintf(szTmp, bufferSize, "init=epsg:%s",tokens[1]);
             msInitProjection(&sProjTmp);
             if (msLoadProjectionString(&sProjTmp, szTmp) == 0)