com php-src: fix signature: ext/json/json.c ext/json/php_json .h
| From: | Anatol Belski | Date: | Wed, 27 Aug 2014 20:13:01 +0000 |
| Subject: | com php-src: fix signature: ext/json/json.c ext/json/php_json .h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81221@lists.php.net to get a copy of this message | ||
Commit: 232459efd0d185487988e069209dc523472fef5d
Author: Anatol Belski <ab@php.net> Wed, 27 Aug 2014 22:13:01 +0200
Parents: 074c68e9ce0a22d767b600b6fcea6ca777e53ada
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=232459efd0d185487988e069209dc523472fef5d
Log:
fix signature
Changed paths:
M ext/json/json.c
M ext/json/php_json.h
Diff:
diff --git a/ext/json/json.c b/ext/json/json.c
index 3c5e22c..24324bb 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -664,7 +664,7 @@ again:
}
/* }}} */
-PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, size_t str_len, size_t options,
zend_long depth TSRMLS_DC) /* {{{ */
+PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, size_t str_len, zend_long
options, zend_long depth TSRMLS_DC) /* {{{ */
{
size_t utf16_len;
unsigned short *utf16;
diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index 1a4fb17..08a4a7f 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -50,7 +50,7 @@ ZEND_END_MODULE_GLOBALS(json)
#endif
PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_DC);
-PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, size_t str_len, int options,
zend_long depth TSRMLS_DC);
+PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, size_t str_len, zend_long
options, zend_long depth TSRMLS_DC);
extern PHP_JSON_API zend_class_entry *php_json_serializable_ce;