mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-24 02:22:13 +08:00
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
From ccb7b1c48b26256a81a264baeb4ab9d06cf7221e Mon Sep 17 00:00:00 2001
|
|
From: Darafei Praliaskouski <me@komzpa.net>
|
|
Date: Sat, 16 Dec 2017 10:40:06 +0000
|
|
Subject: [PATCH] Do not include private header for json-c >= 0.13
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Patch by Björn Esser
|
|
|
|
Closes #3942
|
|
Closes https://github.com/postgis/postgis/pull/173
|
|
|
|
|
|
|
|
git-svn-id: http://svn.osgeo.org/postgis/trunk@16155 b70326c6-7e19-0410-871a-916f4a2858ee
|
|
---
|
|
liblwgeom/lwin_geojson.c | 6 ++++++
|
|
2 files changed, 7 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 */
|