[mapserver-commits] r7242 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2008-01-03 10:49:53 -0500 (Thu, 03 Jan 2008)
New Revision: 7242

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogcfilter.c
   trunk/mapserver/mapogcfilter.h
Log:
use USE_LIBXML2 in ifdefs (#2416)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-01-03 13:53:29 UTC (rev 7241)
+++ trunk/mapserver/HISTORY.TXT	2008-01-03 15:49:53 UTC (rev 7242)
@@ -13,6 +13,8 @@
 Current Version (5.1-dev, SVN trunk):
 -------------------------------------
 
+- mapogcfilter.c: use USE_LIBXML2 in ifdefs (#2416)
+
 - clean up naming conventions of Shapefile API (#599)
 
 - use msComputeBounds() instead, since it's already in the codebase (#2087)

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2008-01-03 13:53:29 UTC (rev 7241)
+++ trunk/mapserver/mapogcfilter.c	2008-01-03 15:49:53 UTC (rev 7242)
@@ -3802,7 +3802,7 @@
     }
     return NULL;
 }
-#ifdef USE_SOS_SVR
+#ifdef USE_LIBXML2
 
 xmlNodePtr FLTGetCapabilities(xmlNsPtr psNsOgc)
 {

Modified: trunk/mapserver/mapogcfilter.h
===================================================================
--- trunk/mapserver/mapogcfilter.h	2008-01-03 13:53:29 UTC (rev 7241)
+++ trunk/mapserver/mapogcfilter.h	2008-01-03 15:49:53 UTC (rev 7242)
@@ -35,7 +35,7 @@
 /* There is a dependency to OGR for the MiniXML parser */
 #include "cpl_minixml.h"
 
-#ifdef USE_SOS_SVR
+#ifdef USE_LIBXML2
 
 #include<libxml/parser.h>
 #include<libxml/tree.h>
@@ -121,7 +121,7 @@
 
 MS_DLL_EXPORT FilterEncodingNode *FLTCreateFeatureIdFilterEncoding(char *pszString);
 
-#ifdef USE_SOS_SVR
+#ifdef USE_LIBXML2
 MS_DLL_EXPORT xmlNodePtr FLTGetCapabilities(xmlNsPtr psNsOgc);
 #endif