mirror of
https://github.com/php/php-src.git
synced 2026-04-24 00:18:23 +02:00
MFB: Fixed compiler warnings and enable Json by default.
This commit is contained in:
@@ -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);
|
||||
|
||||
+2
-2
@@ -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])
|
||||
|
||||
+1
-3
@@ -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[]
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user