diff options
Diffstat (limited to 'ext/json/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index ee8affa1d1..7d258805b2 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -50,7 +50,8 @@ typedef enum { PHP_JSON_ERROR_INF_OR_NAN, PHP_JSON_ERROR_UNSUPPORTED_TYPE, PHP_JSON_ERROR_INVALID_PROPERTY_NAME, - PHP_JSON_ERROR_UTF16 + PHP_JSON_ERROR_UTF16, + PHP_JSON_ERROR_NON_BACKED_ENUM, } php_json_error_code; /* json_decode() options */ @@ -100,7 +101,7 @@ PHP_JSON_API int php_json_encode_ex(smart_str *buf, zval *val, int options, zend PHP_JSON_API int php_json_encode(smart_str *buf, zval *val, int options); PHP_JSON_API int php_json_decode_ex(zval *return_value, const char *str, size_t str_len, zend_long options, zend_long depth); -static inline int php_json_decode(zval *return_value, const char *str, int str_len, zend_bool assoc, zend_long depth) +static inline int php_json_decode(zval *return_value, const char *str, int str_len, bool assoc, zend_long depth) { return php_json_decode_ex(return_value, str, str_len, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0, depth); } |