Add ACCEPT_USE_OF_DEPRECATED_PROJ_API_H

winsento · Apr 3, 2019 · 04485fa · 04485fa
1 parent 38fa2a9
commit 04485fa
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/SConstruct b/SConstruct
@@ -871,6 +871,9 @@ def CheckProjData(context, silent=False):
     ret = context.TryRun("""
 
 // This is narly, could eventually be replaced using https://github.com/OSGeo/proj.4/pull/551]
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+ #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif
 #include <proj_api.h>
 #include <iostream>
 #include <cstring>

diff --git a/src/proj_transform.cpp b/src/proj_transform.cpp
@@ -34,6 +34,9 @@
 
 #ifdef MAPNIK_USE_PROJ4
 // proj4
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+ #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif
 #include <proj_api.h>
 #endif
 

diff --git a/src/projection.cpp b/src/projection.cpp
@@ -30,6 +30,9 @@
 
 #ifdef MAPNIK_USE_PROJ4
 // proj4
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+ #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif
 #include <proj_api.h>
  #if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
     #include <mutex>

diff --git a/test/cleanup.hpp b/test/cleanup.hpp
@@ -16,6 +16,9 @@
 
 #include <unicode/uclean.h>
 #ifdef MAPNIK_USE_PROJ4
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+ #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif
 #include <proj_api.h>
 #endif
 

diff --git a/test/unit/projection/proj_transform.cpp b/test/unit/projection/proj_transform.cpp
@@ -7,6 +7,9 @@
 
 #ifdef MAPNIK_USE_PROJ4
 // proj4
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+ #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif
 #include <proj_api.h>
 #endif