From 9e50c8c0e207191c4c7bb6883f7ad485df04fc2c Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Sun, 1 Nov 2020 14:56:17 +0100 Subject: Remove ACCEPT_USE_OF_DEPRECATED_PROJ_API_H macro --- src/apps/emess.cpp | 4 ---- src/proj_internal.h | 4 ---- src/tests/multistresstest.cpp | 4 ---- src/tests/test228.cpp | 4 ---- test/fuzzers/standard_fuzzer.cpp | 1 - test/unit/pj_transform_test.cpp | 2 -- 6 files changed, 19 deletions(-) diff --git a/src/apps/emess.cpp b/src/apps/emess.cpp index 138cbf01..5a50cd25 100644 --- a/src/apps/emess.cpp +++ b/src/apps/emess.cpp @@ -9,10 +9,6 @@ # endif #endif -#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H -#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H -#endif - #include #include #include diff --git a/src/proj_internal.h b/src/proj_internal.h index 5a075088..e0cc5170 100644 --- a/src/proj_internal.h +++ b/src/proj_internal.h @@ -33,10 +33,6 @@ #error "proj_internal.h can only be included from a C++ file" #endif -#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H -#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H -#endif - #ifdef _MSC_VER # ifndef _CRT_SECURE_NO_DEPRECATE # define _CRT_SECURE_NO_DEPRECATE diff --git a/src/tests/multistresstest.cpp b/src/tests/multistresstest.cpp index 6af35979..51720fbd 100644 --- a/src/tests/multistresstest.cpp +++ b/src/tests/multistresstest.cpp @@ -30,10 +30,6 @@ #include #include -#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H -#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H -#endif - #include "proj_internal.h" #ifdef _WIN32 diff --git a/src/tests/test228.cpp b/src/tests/test228.cpp index b27ebf2f..bffb8e79 100644 --- a/src/tests/test228.cpp +++ b/src/tests/test228.cpp @@ -26,10 +26,6 @@ * DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H -#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H -#endif - #include "proj_internal.h" #include /* for printf declaration */ diff --git a/test/fuzzers/standard_fuzzer.cpp b/test/fuzzers/standard_fuzzer.cpp index 552ac781..ab30200b 100644 --- a/test/fuzzers/standard_fuzzer.cpp +++ b/test/fuzzers/standard_fuzzer.cpp @@ -34,7 +34,6 @@ #include #include -#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H #include "proj.h" #include "proj_internal.h" diff --git a/test/unit/pj_transform_test.cpp b/test/unit/pj_transform_test.cpp index 5f390541..6f02ec5a 100644 --- a/test/unit/pj_transform_test.cpp +++ b/test/unit/pj_transform_test.cpp @@ -26,8 +26,6 @@ * DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H - #include "gtest_include.h" #include -- cgit v1.2.3