34 lines
1018 B
Diff
34 lines
1018 B
Diff
From a079dba76b209b788e9ced3641e2289b0820216c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
|
Date: Fri, 15 Dec 2017 13:35:40 +0100
|
|
Subject: [PATCH] geojson: Do not include private header for json-c >= 0.13
|
|
|
|
---
|
|
liblwgeom/lwin_geojson.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c
|
|
index 749d03374..ef907ee79 100644
|
|
--- 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 */
|