Do not include private header for json-c >= 0.13

Patch by Björn Esser

Closes #3942 for 2.4 branch

(also fixes NEWS section corrupted by recent commit)

git-svn-id: http://svn.osgeo.org/postgis/branches/2.4@16417 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/NEWS b/NEWS
index 862edccc57ed57c26054d7b8cd426477b681f92f..47e2e93ed4a6e0ef4a7b82fb9e52e250c12ba3ac 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,15 +7,15 @@ PostGIS 2.4.4dev
   - #4003, lwpoly_construct_circle: Avoid division by zero (Raúl Marín Rodríguez)
   - #4020, Casting from box3d to geometry now returns correctly connected
            PolyhedralSurface (Matthias Bay)
-
-PostGIS 2.3.6
-2018/01/17
+  - #3942, geojson: Do not include private header for json-c >= 0.13
+           (Björn Esser)
 
  * Enhancements *
     - #3992, Use PKG_PROG_PKG_CONFIG macro from pkg.m4 to detect pkg-config
              (Bas Couwenberg)
     - #3946, Support for PgSQL 11 (Paul Ramsey)
 
+
 PostGIS 2.4.3
 2018/01/17
 

diff --git a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c
index 749d03374b7288fb6558f4671d4d9c8f5910f3e0..ef907ee799395b95db77f98c2598007384855fd7 100644 (file)
--- a/liblwgeom/lwin_geojson.c
+++ b/liblwgeom/lwin_geojson.c
@@ -31,13 +31,19 @@
 
 #if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */
 
+#define JSON_C_VERSION_013 (13 << 8)
+
 #ifdef HAVE_LIBJSON_C
 #include <json-c/json.h>
+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
 #include <json-c/json_object_private.h>
+#endif
 #else
 #include <json/json.h>
+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
 #include <json/json_object_private.h>
 #endif
+#endif
 
 #ifndef JSON_C_VERSION
 /* Adds support for libjson < 0.10 */