Merge pull request #6121 from MapServer-backport-bot/backport-6120-to…

…-branch-7-6 [Backport branch-7-6] Build error if USE_LIBXML2, USE_WMS_SVR, USE_WFS_SVR not defined (#6119)
MapServer · Jul 17, 2020 · 1231c31 · 1231c31
2 parents 90daf33 + 1094e81
commit 1231c31
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/mapmetadata.c b/mapmetadata.c
@@ -31,6 +31,7 @@
 #include "mapowscommon.h"
 #include "maplibxml2.h"
 
+#ifdef USE_LIBXML2
 
 /************************************************************************/
 /*                   _msMetadataGetCharacterString                      */
@@ -860,6 +861,8 @@ int msMetadataDispatch(mapObj *map, cgiRequestObj *cgi_request, owsRequestObj *o
   return status;
 }
 
+#endif /* USE_LIBXML2 */
+
 /************************************************************************/
 /*                           msMetadataCreateParamsObj                  */
 /*                                                                      */

diff --git a/mapogcfilter.c b/mapogcfilter.c
@@ -2269,7 +2269,7 @@ char *FLTGetSQLExpression(FilterEncodingNode *psFilterNode, layerObj *lp)
 #else
     msSetError(MS_MISCERR, "OWS support is not available.",
                "FLTGetSQLExpression()");
-    return(MS_FAILURE);
+    return NULL;
 #endif
 
   }

diff --git a/mapows.c b/mapows.c
@@ -261,11 +261,13 @@ int msOWSDispatch(mapObj *map, cgiRequestObj *request, int ows_mode)
   }
 
   if (ows_request.service == NULL) {
+#ifdef USE_LIBXML2
     if (ows_request.request && EQUAL(ows_request.request, "GetMetadata")) {
       status = msMetadataDispatch(map, request, &ows_request);
       msOWSClearRequestObj(&ows_request);
       return status;
     }
+#endif
 #ifdef USE_WFS_SVR
     if( msOWSLookupMetadata(&(map->web.metadata), "FO", "cite_wfs2") != NULL ) {
       status = msWFSException(map, "service", MS_OWS_ERROR_MISSING_PARAMETER_VALUE, NULL );

diff --git a/mapows.h b/mapows.h
@@ -410,12 +410,12 @@ typedef struct {
   int numnamespaces;
 } gmlNamespaceListObj;
 
+MS_DLL_EXPORT gmlItemListObj *msGMLGetItems(layerObj *layer, const char *metadata_namespaces);
+MS_DLL_EXPORT void msGMLFreeItems(gmlItemListObj *itemList);
 
 #if defined(USE_WMS_SVR) || defined (USE_WFS_SVR)
 
 MS_DLL_EXPORT int msItemInGroups(const char *name, gmlGroupListObj *groupList);
-MS_DLL_EXPORT gmlItemListObj *msGMLGetItems(layerObj *layer, const char *metadata_namespaces);
-MS_DLL_EXPORT void msGMLFreeItems(gmlItemListObj *itemList);
 MS_DLL_EXPORT gmlConstantListObj *msGMLGetConstants(layerObj *layer, const char *metadata_namespaces);
 MS_DLL_EXPORT void msGMLFreeConstants(gmlConstantListObj *constantList);
 MS_DLL_EXPORT gmlGeometryListObj *msGMLGetGeometries(layerObj *layer, const char *metadata_namespaces, int bWithDefaultGeom);