From 66f228cfbcf6e47effc5771a29bfaa93b0bf5eb5 Mon Sep 17 00:00:00 2001
From: Kristian Evers <kristianevers@gmail.com>
Date: Tue, 18 Sep 2018 14:00:48 +0200
Subject: Only allow usage of proj_api.h if explicit consent was given

We want to flag that proj_api_h is now deprecated. With this commit
it is now mandatory to #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
before proj_api.h can be included.

proj_api.h is used internally a bunch of places. Therefore
ACCEPT_USE_OF_DEPRECATED_PROJ_API_H has been defined in projects.h
and a few other necessary files to ensure that PROJ compiles.

Closes #836
---
 src/emess.c           | 4 ++++
 src/multistresstest.c | 5 +++++
 src/pj_mutex.c        | 3 +++
 src/proj_api.h        | 5 +++++
 src/projects.h        | 4 ++++
 5 files changed, 21 insertions(+)

(limited to 'src')

diff --git a/src/emess.c b/src/emess.c
index 330b8412..eb2ac9d6 100644
--- a/src/emess.c
+++ b/src/emess.c
@@ -9,6 +9,10 @@
 #  endif
 #endif
 
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif
+
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/multistresstest.c b/src/multistresstest.c
index adedb8bd..b0bd5c9c 100644
--- a/src/multistresstest.c
+++ b/src/multistresstest.c
@@ -29,6 +29,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif
+
 #include "proj_api.h"
 
 #ifdef _WIN32
diff --git a/src/pj_mutex.c b/src/pj_mutex.c
index ba1b2def..dc4a441b 100644
--- a/src/pj_mutex.c
+++ b/src/pj_mutex.c
@@ -40,6 +40,9 @@
 #include "proj_config.h"
 #include "projects.h"
 #else
+#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/proj_api.h b/src/proj_api.h
index 81cda69a..000a0baf 100644
--- a/src/proj_api.h
+++ b/src/proj_api.h
@@ -32,6 +32,11 @@
   * when a few minor-version releases has been made.
   *
   */
+
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#error 'To use the proj_api.h you must define the macro ACCEPT_USE_OF_DEPRECATED_PROJ_API_H'
+#endif
+
 #ifndef PJ_VERSION
 #define PJ_VERSION 600
 #endif
diff --git a/src/projects.h b/src/projects.h
index ee0e2b65..c4f09a8d 100644
--- a/src/projects.h
+++ b/src/projects.h
@@ -29,6 +29,10 @@
 #ifndef PROJECTS_H
 #define PROJECTS_H
 
+#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
-- 
cgit v1.2.3