diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-19 10:05:57 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-19 10:05:57 -0800 |
| commit | 1fdd558e39beeeca9166eef4311b98f1926f642b (patch) | |
| tree | 8e0ffff2fdfa5ff5debb65bed15e5fdee5ed6d9f /ext/json/php_json.h | |
| parent | 1b53a99fbf847ce346e24bb2f25a0ca2298b94a1 (diff) | |
| parent | ac7cfad3b54b04b7ff2d0e4bfd26e8b61d233613 (diff) | |
| download | php-git-1fdd558e39beeeca9166eef4311b98f1926f642b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #50224 where float without decimals were converted to integer
Updated NEWS for #68371
Diffstat (limited to 'ext/json/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index b175d9a157..0ba4154f2f 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -68,6 +68,7 @@ extern PHP_JSON_API zend_class_entry *php_json_serializable_ce; #define PHP_JSON_PRETTY_PRINT (1<<7) #define PHP_JSON_UNESCAPED_UNICODE (1<<8) #define PHP_JSON_PARTIAL_OUTPUT_ON_ERROR (1<<9) +#define PHP_JSON_PRESERVE_ZERO_FRACTION (1<<10) /* Internal flags */ #define PHP_JSON_OUTPUT_ARRAY 0 |