diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-08-29 15:01:00 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-08-29 15:01:00 +0100 |
| commit | ab65665a0ec5a3c5da8a9ad8c7f209b5038ce14a (patch) | |
| tree | e5f277594d91668713c04ae4697edcde23bff296 /ext/json/php_json_encoder.h | |
| parent | 50c5d13d26b5cd471c7be5db81cf5d57ff957437 (diff) | |
| parent | f5b4aae7acad9ad86bd00c0209af28b273e5d82e (diff) | |
| download | php-git-ab65665a0ec5a3c5da8a9ad8c7f209b5038ce14a.tar.gz | |
Merge branch 'json_encode_fail_return' into PHP-7.1
Diffstat (limited to 'ext/json/php_json_encoder.h')
| -rw-r--r-- | ext/json/php_json_encoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/php_json_encoder.h b/ext/json/php_json_encoder.h index b10f7a614a..0fec9174b5 100644 --- a/ext/json/php_json_encoder.h +++ b/ext/json/php_json_encoder.h @@ -22,6 +22,6 @@ #include "php.h" #include "zend_smart_str.h" -void php_json_encode_zval(smart_str *buf, zval *val, int options); +int php_json_encode_zval(smart_str *buf, zval *val, int options); #endif /* PHP_JSON_ENCODER_H */ |