From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 19 Jul 2006 16:17:15 +0000 (+0000)
Subject: Fixed compiler warnings and enable Json by default.
X-Git-Tag: php-5.2.0RC1~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdfe00b8014bc6eb94edc9ce0c0d6b7a154fa03d;p=php

Fixed compiler warnings and enable Json by default.
---

diff --git a/ext/json/JSON_parser.h b/ext/json/JSON_parser.h
index 085e776982..4790f728e3 100644
--- 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 a937b1f91b..065d0411aa 100644
--- 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 d19eb2e9b5..30c394cce6 100644
--- 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[]
  *