]>
Commit | Line | Data |
---|---|---|
83cabce9 JR |
1 | --- postgis-2.1.3/liblwgeom/lwin_geojson.c~ 2014-04-03 23:53:20.000000000 +0200 |
2 | +++ postgis-2.1.3/liblwgeom/lwin_geojson.c 2014-11-24 00:33:07.024233277 +0100 | |
3 | @@ -17,8 +17,8 @@ | |
4 | ||
5 | #ifdef HAVE_LIBJSON | |
6 | ||
7 | -#include <json/json.h> | |
8 | -#include <json/json_object_private.h> | |
9 | +#include <json-c/json.h> | |
10 | +#include <json-c/json_object_private.h> | |
11 | #include <string.h> | |
12 | ||
13 | static void geojson_lwerror(char *msg, int error_code) | |
9d5295c5 JR |
14 | @@ -510,7 +510,7 @@ |
15 | if( jstok->err != json_tokener_success) | |
16 | { | |
17 | char err[256]; | |
18 | - snprintf(err, 256, "%s (at offset %d)", json_tokener_errors[jstok->err], jstok->char_offset); | |
19 | + snprintf(err, 256, "%s (at offset %d)", json_tokener_error_desc(jstok->err), jstok->char_offset); | |
20 | json_tokener_free(jstok); | |
21 | json_object_put(poObj); | |
22 | geojson_lwerror(err, 1); |