[mapserver-commits] r11910 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-07-12 11:09:25 -0700 (Tue, 12 Jul 2011)
New Revision: 11910

Modified:
   branches/branch-6-0/mapserver/mappostgis.c
Log:
Added missing ifdef USE_POSTGIS in msPostGISEscapeSQLParam() (#3903)

Modified: branches/branch-6-0/mapserver/mappostgis.c
===================================================================
--- branches/branch-6-0/mapserver/mappostgis.c	2011-07-12 14:21:15 UTC (rev 11909)
+++ branches/branch-6-0/mapserver/mappostgis.c	2011-07-12 18:09:25 UTC (rev 11910)
@@ -3302,8 +3302,9 @@
     return MS_FALSE;
 }
 
-char *msPostGISEscapeSQLParam(layerObj *layer, char *pszString)
+char *msPostGISEscapeSQLParam(layerObj *layer, const char *pszString)
 {
+#ifdef USE_POSTGIS
     msPostGISLayerInfo *layerinfo = NULL;
     int nError;
     size_t nSrcLen;
@@ -3327,6 +3328,12 @@
         }
     }
     return pszEscapedStr;
+#else
+    msSetError( MS_MISCERR,
+                "PostGIS support is not available.",
+                "msPostGISEscapeSQLParam()");
+    return NULL;
+#endif
 }