Avoid including header files inside an extern C block (#5117)

Author: tbonfort

mapcontext.c

@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 #include "mapserver.h"
-
+#include "mapows.h"
 
 
 #if defined(USE_WMS_LYR) && defined(USE_OGR)

mapdraw.c

@@ -33,6 +33,7 @@
 #include "maptime.h"
 #include "mapcopy.h"
 #include "mapfile.h"
+#include "mapows.h"
 
 
 /* msPrepareImage()

mapgml.c

@@ -29,6 +29,7 @@
 
 #include "mapserver.h"
 #include "maperror.h"
+#include "mapows.h"
 #include "mapgml.h"
 #include "maptime.h"
 

mapkmlrenderer.cpp

@@ -34,6 +34,7 @@
 #include "maperror.h"
 #include "mapkmlrenderer.h"
 #include "mapio.h"
+#include "mapows.h"
 
 #if defined(USE_OGR)
 #  include "cpl_conv.h"

mapobject.c

@@ -29,6 +29,7 @@
  ****************************************************************************/
 
 #include "mapserver.h"
+#include "mapows.h"
 
 #ifdef USE_GDAL
 #  include "gdal.h"

mapogcfilter.c

@@ -39,6 +39,7 @@
 #include "mapserver.h"
 #include "mapowscommon.h"
 #include "maptime.h"
+#include "mapows.h"
 
 static int FLTHasUniqueTopLevelDuringFilter(FilterEncodingNode *psFilterNode);
 

mapogcsld.c

@@ -29,6 +29,7 @@
 #include "mapogcsld.h"
 #include "mapogcfilter.h"
 #include "mapserver.h"
+#include "mapows.h"
 
 #ifdef USE_OGR
 #include "cpl_string.h"

mapogcsos.c

@@ -30,6 +30,7 @@
 #define _GNU_SOURCE
 
 #include "mapserver.h"
+#include "mapows.h"
 
 #if defined(USE_SOS_SVR) && defined(USE_LIBXML2)
 

mapogr.cpp

@@ -32,6 +32,7 @@
 #include "mapserver.h"
 #include "mapproject.h"
 #include "mapthread.h"
+#include "mapows.h"
 
 #if defined(USE_OGR) || defined(USE_GDAL)
 #  include "gdal_version.h"

mapogroutput.c

@@ -31,6 +31,7 @@
 #include "mapserver.h"
 #include "mapproject.h"
 #include "mapthread.h"
+#include "mapows.h"
 
 #if defined(USE_OGR)
 #  define __USE_LARGEFILE64 1

mapows.c

@@ -30,6 +30,7 @@
 #include "mapserver.h"
 #include "maptime.h"
 #include "maptemplate.h"
+#include "mapows.h"
 
 #if defined(USE_LIBXML2)
 #include "maplibxml2.h"

mapows.h

@@ -40,6 +40,15 @@
  */
 #define OWS_DEFAULT_SCHEMAS_LOCATION   "http://schemas.opengis.net"
 
+#if defined USE_LIBXML2 && defined USE_WFS_SVR
+#include<libxml/tree.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /*====================================================================
  *   mapows.c
  *====================================================================*/
@@ -474,7 +483,6 @@ int msWFSException11(mapObj *map, const char *locator,
 int msWFSGetCapabilities11(mapObj *map, wfsParamsObj *wfsparams,
                            cgiRequestObj *req, owsRequestObj *ows_request);
 #ifdef USE_LIBXML2
-#include<libxml/tree.h>
 xmlNodePtr msWFSDumpLayer11(mapObj *map, layerObj *lp, xmlNsPtr psNsOws,
                           int nWFSVersion, const char* validate_language);
 #endif
@@ -535,6 +543,9 @@ int msWCSDispatch(mapObj *map, cgiRequestObj *requestobj, owsRequestObj *ows_req
 
 int msSOSDispatch(mapObj *map, cgiRequestObj *requestobj, owsRequestObj *ows_request); /* only 1 public function */
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
 
 #endif /* MAPOWS_H */
 

mapserver.h

@@ -2805,12 +2805,6 @@ void msPopulateTextSymbolForLabelAndString(textSymbolObj *ts, labelObj *l, char
   MS_DLL_EXPORT void *msGetSymbol(const char *pszLibrary,
                                   const char *pszEntryPoint);
 
-  /* ==================================================================== */
-  /*      include definitions from mapows.h                               */
-  /* ==================================================================== */
-#include "mapows.h"
-
-
   /* ==================================================================== */
   /*      prototypes for functions in mapgeos.c                         */
   /* ==================================================================== */

mapwcs.c

@@ -30,6 +30,7 @@
 #include "mapserver.h"
 #include "maperror.h"
 #include "mapthread.h"
+#include "mapows.h"
 #include <assert.h>
 
 

mapwcs11.c

@@ -33,6 +33,7 @@
 #include "mapserver.h"
 #include "maperror.h"
 #include "mapthread.h"
+#include "mapows.h"
 #include "mapwcs.h"
 
 

mapwcs20.c

@@ -36,6 +36,7 @@
 #include "mapserver.h"
 #include "maperror.h"
 #include "mapthread.h"
+#include "mapows.h"
 #include "mapwcs.h"
 #include <float.h>
 #include "gdal.h"

mapwfs.c

@@ -28,6 +28,7 @@
  ****************************************************************************/
 
 #include "mapserver.h"
+#include "mapows.h"
 
 
 

mapwms.c

@@ -35,6 +35,7 @@
 #include "mapgml.h"
 #include <ctype.h>
 #include "maptemplate.h"
+#include "mapows.h"
 
 #include "mapogcsld.h"
 #include "mapogcfilter.h"

mapwmslayer.c

@@ -30,6 +30,7 @@
 #include "mapserver.h"
 #include "maperror.h"
 #include "mapogcsld.h"
+#include "mapows.h"
 
 #include <time.h>
 #include <ctype.h>