summaryrefslogtreecommitdiff
path: root/community/postgis/fix_json_012.patch
blob: 92da5a2f2bd36f1d01b8c41e5eba4cd74358cf00 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
diff -N -aur postgis-2.1.3.orig/liblwgeom/lwin_geojson.c postgis-2.1.3/liblwgeom/lwin_geojson.c
--- postgis-2.1.3.orig/liblwgeom/lwin_geojson.c	2014-05-29 12:27:08.842806693 +0000
+++ postgis-2.1.3/liblwgeom/lwin_geojson.c	2014-05-29 12:27:24.349473709 +0000
@@ -17,8 +17,8 @@
 
 #ifdef HAVE_LIBJSON
 
-#include <json/json.h>
-#include <json/json_object_private.h>
+#include <json-c/json.h>
+#include <json-c/json_object_private.h>
 #include <string.h>
 
 static void geojson_lwerror(char *msg, int error_code)
@@ -510,7 +510,7 @@
 	if( jstok->err != json_tokener_success)
 	{
 		char err[256];
-		snprintf(err, 256, "%s (at offset %d)", json_tokener_errors[jstok->err], jstok->char_offset);
+		snprintf(err, 256, "%s (at offset %d)", json_tokener_error_desc(jstok->err), jstok->char_offset);
 		json_tokener_free(jstok);
     json_object_put(poObj);
 		geojson_lwerror(err, 1);