Permalink
Browse files

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

  • Loading branch information...
tbonfort committed Jul 9, 2015
1 parent e91f7b2 commit 175475278c712e0c297dc8c04c5e7d32d23865ab
Showing with 29 additions and 8 deletions.
  1. +1 −1 mapcontext.c
  2. +1 −0 mapdraw.c
  3. +1 −0 mapgml.c
  4. +1 −0 mapkmlrenderer.cpp
  5. +1 −0 mapobject.c
  6. +1 −0 mapogcfilter.c
  7. +1 −0 mapogcsld.c
  8. +1 −0 mapogcsos.c
  9. +1 −0 mapogr.cpp
  10. +1 −0 mapogroutput.c
  11. +1 −0 mapows.c
  12. +12 −1 mapows.h
  13. +0 −6 mapserver.h
  14. +1 −0 mapwcs.c
  15. +1 −0 mapwcs11.c
  16. +1 −0 mapwcs20.c
  17. +1 −0 mapwfs.c
  18. +1 −0 mapwms.c
  19. +1 −0 mapwmslayer.c
View
@@ -27,7 +27,7 @@
****************************************************************************/
#include "mapserver.h"
-
+#include "mapows.h"
#if defined(USE_WMS_LYR) && defined(USE_OGR)
View
@@ -33,6 +33,7 @@
#include "maptime.h"
#include "mapcopy.h"
#include "mapfile.h"
+#include "mapows.h"
/* msPrepareImage()
View
@@ -29,6 +29,7 @@
#include "mapserver.h"
#include "maperror.h"
+#include "mapows.h"
#include "mapgml.h"
#include "maptime.h"
View
@@ -34,6 +34,7 @@
#include "maperror.h"
#include "mapkmlrenderer.h"
#include "mapio.h"
+#include "mapows.h"
#if defined(USE_OGR)
# include "cpl_conv.h"
View
@@ -29,6 +29,7 @@
****************************************************************************/
#include "mapserver.h"
+#include "mapows.h"
#ifdef USE_GDAL
# include "gdal.h"
View
@@ -39,6 +39,7 @@
#include "mapserver.h"
#include "mapowscommon.h"
#include "maptime.h"
+#include "mapows.h"
static int FLTHasUniqueTopLevelDuringFilter(FilterEncodingNode *psFilterNode);
View
@@ -29,6 +29,7 @@
#include "mapogcsld.h"
#include "mapogcfilter.h"
#include "mapserver.h"
+#include "mapows.h"
#ifdef USE_OGR
#include "cpl_string.h"
View
@@ -30,6 +30,7 @@
#define _GNU_SOURCE
#include "mapserver.h"
+#include "mapows.h"
#if defined(USE_SOS_SVR) && defined(USE_LIBXML2)
View
@@ -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"
View
@@ -31,6 +31,7 @@
#include "mapserver.h"
#include "mapproject.h"
#include "mapthread.h"
+#include "mapows.h"
#if defined(USE_OGR)
# define __USE_LARGEFILE64 1
View
@@ -30,6 +30,7 @@
#include "mapserver.h"
#include "maptime.h"
#include "maptemplate.h"
+#include "mapows.h"
#if defined(USE_LIBXML2)
#include "maplibxml2.h"
View
@@ -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 */
View
@@ -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 */
/* ==================================================================== */
View
@@ -30,6 +30,7 @@
#include "mapserver.h"
#include "maperror.h"
#include "mapthread.h"
+#include "mapows.h"
#include <assert.h>
View
@@ -33,6 +33,7 @@
#include "mapserver.h"
#include "maperror.h"
#include "mapthread.h"
+#include "mapows.h"
#include "mapwcs.h"
View
@@ -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"
View
@@ -28,6 +28,7 @@
****************************************************************************/
#include "mapserver.h"
+#include "mapows.h"
View
@@ -35,6 +35,7 @@
#include "mapgml.h"
#include <ctype.h>
#include "maptemplate.h"
+#include "mapows.h"
#include "mapogcsld.h"
#include "mapogcfilter.h"
View
@@ -30,6 +30,7 @@
#include "mapserver.h"
#include "maperror.h"
#include "mapogcsld.h"
+#include "mapows.h"
#include <time.h>
#include <ctype.h>

0 comments on commit 1754752

Please sign in to comment.