[mapserver-commits] r7732 - trunk/mapserver

[svn at osgeo.org]

Author: Assefa
Date: 2008-06-23 18:19:41 -0400 (Mon, 23 Jun 2008)
New Revision: 7732

Modified:
   trunk/mapserver/mapogcfilter.c
   trunk/mapserver/mapwcs11.c
Log:
Fix windows build errors when all OGC flags are disabled (#2658)

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2008-06-23 22:05:28 UTC (rev 7731)
+++ trunk/mapserver/mapogcfilter.c	2008-06-23 22:19:41 UTC (rev 7732)
@@ -3946,6 +3946,8 @@
     char szTmp[256];
     const char *pszFullName = NULL;
 
+#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR)
+
     if (psFilterNode && map && i>=0 && i<map->numlayers)
     {
         lp = GET_LAYER(map, i);
@@ -3965,7 +3967,12 @@
             }
             msLayerClose(lp);
         }
-    }    
+    } 
+#else
+    msSetError(MS_MISCERR, "OWS support is not available.", 
+               "FLTPreParseFilterForAlias()");
+    
+#endif   
 }
 
 

Modified: trunk/mapserver/mapwcs11.c
===================================================================
--- trunk/mapserver/mapwcs11.c	2008-06-23 22:05:28 UTC (rev 7731)
+++ trunk/mapserver/mapwcs11.c	2008-06-23 22:19:41 UTC (rev 7732)
@@ -941,6 +941,7 @@
 /*      if found in the RangeSubset.                                    */
 /************************************************************************/
 
+#if defined(USE_WCS_SVR)
 int msWCSGetCoverageBands11( mapObj *map, cgiRequestObj *request, 
                              wcsParamsObj *params, layerObj *lp,
                              char **p_bandlist )
@@ -1054,6 +1055,7 @@
 
     return MS_SUCCESS;
 }    
+#endif
 
 /************************************************************************/
 /*                       msWCSReturnCoverage11()                        */