Browse Source

MFB: Fixed compiler warnings and enable Json by default.

migration/RELEASE_1_0_0
Ilia Alshanetsky 20 years ago
parent
commit
369b7e44a0
  1. 2
      ext/json/JSON_parser.h
  2. 4
      ext/json/config.m4
  3. 4
      ext/json/json.c

2
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);

4
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])

4
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[]
*

Loading…
Cancel
Save