cvs: php-src /ext/json JSON_parser.h config.m4 json.c

iliaa Wed Jul 19 16:17:56 2006 UTC Modified files: /php-src/ext/json JSON_parser.h config.m4 json.c Log: MFB: Fixed compiler warnings and enable Json by default. http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.h?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/json/JSON_parser.h diff -u php-src/ext/json/JSON_parser.h:1.1 php-src/ext/json/JSON_parser.h:1.2 --- php-src/ext/json/JSON_parser.h:1.1 Tue Jan 31 08:59:06 2006 +++ php-src/ext/json/JSON_parser.h Wed Jul 19 16:17:56 2006 @@ -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); http://cvs.php.net/viewvc.cgi/php-src/ext/json/config.m4?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/json/config.m4 diff -u php-src/ext/json/config.m4:1.3 php-src/ext/json/config.m4:1.4 --- php-src/ext/json/config.m4:1.3 Tue Jan 31 08:59:06 2006 +++ php-src/ext/json/config.m4 Wed Jul 19 16:17:56 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.3 2006/01/31 08:59:06 omar Exp $ +dnl $Id: config.m4,v 1.4 2006/07/19 16:17:56 iliaa Exp $ dnl AC_DEFUN([PHP_JSON_ADD_SOURCES], [ @@ -70,8 +70,8 @@ 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]) http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/json/json.c diff -u php-src/ext/json/json.c:1.9 php-src/ext/json/json.c:1.10 --- php-src/ext/json/json.c:1.9 Sat Mar 18 04:15:16 2006 +++ php-src/ext/json/json.c Wed Jul 19 16:17:56 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: json.c,v 1.9 2006/03/18 04:15:16 omar Exp $ */ +/* $Id: json.c,v 1.10 2006/07/19 16:17:56 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -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[] *