diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-09-04 19:37:05 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-09-04 19:37:12 +0100 |
| commit | 7fe2646be320066bb0ea75aa84699aa73ee33a1b (patch) | |
| tree | 59a3b7d7ceddb73cac9d2ff15534d4bfdd423e46 /ext/json/php_json.h | |
| parent | 45fdff1c8547dce2948cbc64d391892d99399a0e (diff) | |
| download | php-git-7fe2646be320066bb0ea75aa84699aa73ee33a1b.tar.gz | |
Move json_decode options macros bellow encode options
Diffstat (limited to 'ext/json/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index e667a9bd95..4fb0b36881 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -68,6 +68,10 @@ typedef enum { #define PHP_JSON_PARTIAL_OUTPUT_ON_ERROR (1<<9) #define PHP_JSON_PRESERVE_ZERO_FRACTION (1<<10) +/* json_decode() options */ +#define PHP_JSON_OBJECT_AS_ARRAY (1<<0) +#define PHP_JSON_BIGINT_AS_STRING (1<<1) + /* Internal flags */ #define PHP_JSON_OUTPUT_ARRAY 0 #define PHP_JSON_OUTPUT_OBJECT 1 @@ -88,10 +92,6 @@ PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json); ZEND_TSRMLS_CACHE_EXTERN(); #endif -/* json_decode() options */ -#define PHP_JSON_OBJECT_AS_ARRAY (1<<0) -#define PHP_JSON_BIGINT_AS_STRING (1<<1) - PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options); PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, size_t str_len, zend_long options, zend_long depth); |