gdal/gdal-1.11.0-json-c-0.12.patch

--- gdal-1.11.0/frmts/mbtiles/mbtilesdataset.cpp.orig	2014-08-09 11:17:06.899414798 +0200
+++ gdal-1.11.0/frmts/mbtiles/mbtilesdataset.cpp	2014-08-09 11:18:47.629528670 +0200
@@ -620,7 +620,7 @@
     {
         CPLError( CE_Failure, CPLE_AppDefined,
                     "JSON parsing error: %s (at offset %d)",
-                    json_tokener_errors[jstok->err],
+                    json_tokener_get_error(jstok),
                     jstok->char_offset);
         json_tokener_free(jstok);
 
diff -ru gdal-1.11.0.orig/ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp gdal-1.11.0/ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp
--- gdal-1.11.0.orig/ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp	2014-04-16 22:04:31.000000000 +0200
+++ gdal-1.11.0/ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp	2014-08-09 11:29:48.651275930 +0200
@@ -504,7 +504,7 @@
     {
         CPLError( CE_Failure, CPLE_AppDefined,
                     "JSON parsing error: %s (at offset %d)",
-                    json_tokener_errors[jstok->err], jstok->char_offset);
+                    json_tokener_get_error(jstok), jstok->char_offset);
         json_tokener_free(jstok);
         CPLHTTPDestroyResult(psResult);
         return NULL;
diff -ru gdal-1.11.0.orig/ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp gdal-1.11.0/ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp
--- gdal-1.11.0.orig/ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp	2014-04-16 22:04:02.000000000 +0200
+++ gdal-1.11.0/ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp	2014-08-09 11:28:18.735174283 +0200
@@ -1078,7 +1078,7 @@
     {
         CPLError( CE_Failure, CPLE_AppDefined,
                     "JSON parsing error: %s (at offset %d)",
-                    json_tokener_errors[jstok->err], jstok->char_offset);
+                    json_tokener_get_error(jstok), jstok->char_offset);
 
         json_tokener_free(jstok);
 
diff -ru gdal-1.11.0.orig/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp gdal-1.11.0/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
--- gdal-1.11.0.orig/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp	2014-04-16 22:04:30.000000000 +0200
+++ gdal-1.11.0/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp	2014-08-09 11:29:28.135252737 +0200
@@ -78,7 +78,7 @@
         {
             CPLError( CE_Failure, CPLE_AppDefined,
                       "ESRIJSON parsing error: %s (at offset %d)",
-            	      json_tokener_errors[jstok->err], jstok->char_offset);
+            	      json_tokener_get_error(jstok), jstok->char_offset);
             
             json_tokener_free(jstok);
             return OGRERR_CORRUPT_DATA;
diff -ru gdal-1.11.0.orig/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp gdal-1.11.0/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
--- gdal-1.11.0.orig/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp	2014-04-16 22:04:30.000000000 +0200
+++ gdal-1.11.0/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp	2014-08-09 11:28:50.916210662 +0200
@@ -77,7 +77,7 @@
         {
             CPLError( CE_Failure, CPLE_AppDefined,
                       "GeoJSON parsing error: %s (at offset %d)",
-            	      json_tokener_errors[jstok->err], jstok->char_offset);
+            	      json_tokener_get_error(jstok), jstok->char_offset);
             
             json_tokener_free(jstok);
             return OGRERR_CORRUPT_DATA;
@@ -1516,7 +1516,7 @@
         {
             CPLError( CE_Failure, CPLE_AppDefined,
                       "GeoJSON parsing error: %s (at offset %d)",
-                      json_tokener_errors[jstok->err], jstok->char_offset);
+                      json_tokener_get_error(jstok), jstok->char_offset);
             json_tokener_free(jstok);
             return NULL;
         }
diff -ru gdal-1.11.0.orig/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp gdal-1.11.0/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp
--- gdal-1.11.0.orig/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp	2014-04-16 22:04:30.000000000 +0200
+++ gdal-1.11.0/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp	2014-08-09 11:29:09.560231739 +0200
@@ -74,7 +74,7 @@
         {
             CPLError( CE_Failure, CPLE_AppDefined,
                       "TopoJSON parsing error: %s (at offset %d)",
-            	      json_tokener_errors[jstok->err], jstok->char_offset);
+            	      json_tokener_get_error(jstok), jstok->char_offset);
             
             json_tokener_free(jstok);
             return OGRERR_CORRUPT_DATA;
diff -ru gdal-1.11.0.orig/ogr/ogrsf_frmts/gme/ogrgmejson.cpp gdal-1.11.0/ogr/ogrsf_frmts/gme/ogrgmejson.cpp
--- gdal-1.11.0.orig/ogr/ogrsf_frmts/gme/ogrgmejson.cpp	2014-04-16 22:04:30.000000000 +0200
+++ gdal-1.11.0/ogr/ogrsf_frmts/gme/ogrgmejson.cpp	2014-08-09 11:30:02.216291264 +0200
@@ -511,7 +511,7 @@
         {
             CPLError( CE_Failure, CPLE_AppDefined,
                       "JSON parsing error: %s (at offset %d)",
-                          json_tokener_errors[jstok->err], jstok->char_offset);
+                          json_tokener_get_error(jstok), jstok->char_offset);
 
             json_tokener_free(jstok);
             return NULL;