Fixed compiler warnings and enable Json by default.

diff --git a/ext/json/JSON_parser.h b/ext/json/JSON_parser.h
index 085e776982c43f5593266bfac12eb61977ae6544..4790f728e33df54af1cbe7ef1a92dcbbdf949953 100644 (file)
--- a/ext/json/JSON_parser.h
+++ b/ext/json/JSON_parser.h
@@ -3,6 +3,4 @@
 #include "php.h"
 #include "ext/standard/php_smart_str.h"
 
-static char digits[] = "0123456789abcdef";
-
 extern int JSON_parser(zval *z, unsigned short p[], int length, int assoc TSRMLS_DC);

diff --git a/ext/json/config.m4 b/ext/json/config.m4
index a937b1f91b66c00dc21c7d2a57ad8d478a7f1d1f..065d0411aa990a455925805c28016511ce30f9bb 100644 (file)
--- a/ext/json/config.m4
+++ b/ext/json/config.m4
@@ -70,8 +70,8 @@ dnl
 dnl Main config
 dnl
 
-PHP_ARG_WITH(json, whether to enable JavaScript Object Serialization support,
-[  --with-json       Enable JavaScript Object Serialization support])
+PHP_ARG_ENABLE(json, whether to enable JavaScript Object Serialization support,
+[  --disable-json       Disable JavaScript Object Serialization support], yes)
 
 if test "$PHP_JSON" != "no"; then  
   AC_DEFINE([HAVE_JSON],1,[whether to have JavaScript Object Serialization support])

diff --git a/ext/json/json.c b/ext/json/json.c
index d19eb2e9b5c4b20eef2558ef966de5f94d59b09e..30c394cce64aab0a023b422295037d98975a9b64 100644 (file)
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -33,9 +33,7 @@
 /* If you declare any globals in php_json.h uncomment this:
 ZEND_DECLARE_MODULE_GLOBALS(json)
 */
-
-/* True global resources - no need for thread safety here */
-static int le_json;
+static char digits[] = "0123456789abcdef";
 
 /* {{{ json_functions[]
  *