[postgis-tickets] r17792 - Backport json-c 0.13 support
Raul
raul at rmr.ninja
Fri Aug 30 03:35:13 PDT 2019
Author: algunenano
Date: 2019-08-30 03:35:13 -0700 (Fri, 30 Aug 2019)
New Revision: 17792
Modified:
branches/2.3/liblwgeom/lwin_geojson.c
Log:
Backport json-c 0.13 support
References #4497
Closes https://github.com/postgis/postgis/pull/471
Modified: branches/2.3/liblwgeom/lwin_geojson.c
===================================================================
--- branches/2.3/liblwgeom/lwin_geojson.c 2019-08-29 15:58:17 UTC (rev 17791)
+++ branches/2.3/liblwgeom/lwin_geojson.c 2019-08-30 10:35:13 UTC (rev 17792)
@@ -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 */
More information about the postgis-tickets
mailing list