com php-src: json: fix formating of PHP_JSON* option bits hifts: ext/json/php_json.h

Commit: 45fdff1c8547dce2948cbc64d391892d99399a0e Author: Ryan McCullagh <me@ryanmccullagh.com> Thu, 3 Sep 2015 21:13:10 -0500 Committer: Jakub Zelenka <bukka@php.net> Fri, 4 Sep 2015 19:29:54 +0100 Parents: fbfceaaa5d7854b9fae5a67d00c9b9a11f2bad08 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=45fdff1c8547dce2948cbc64d391892d99399a0e Log: json: fix formating of PHP_JSON* option bitshifts Changed paths: M ext/json/php_json.h Diff: diff --git a/ext/json/php_json.h b/ext/json/php_json.h index 4b315b8..e667a9b 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -56,17 +56,17 @@ typedef enum { } php_json_error_code; /* json_encode() options */ -#define PHP_JSON_HEX_TAG (1<<0) -#define PHP_JSON_HEX_AMP (1<<1) -#define PHP_JSON_HEX_APOS (1<<2) -#define PHP_JSON_HEX_QUOT (1<<3) -#define PHP_JSON_FORCE_OBJECT (1<<4) -#define PHP_JSON_NUMERIC_CHECK (1<<5) -#define PHP_JSON_UNESCAPED_SLASHES (1<<6) -#define PHP_JSON_PRETTY_PRINT (1<<7) -#define PHP_JSON_UNESCAPED_UNICODE (1<<8) +#define PHP_JSON_HEX_TAG (1<<0) +#define PHP_JSON_HEX_AMP (1<<1) +#define PHP_JSON_HEX_APOS (1<<2) +#define PHP_JSON_HEX_QUOT (1<<3) +#define PHP_JSON_FORCE_OBJECT (1<<4) +#define PHP_JSON_NUMERIC_CHECK (1<<5) +#define PHP_JSON_UNESCAPED_SLASHES (1<<6) +#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) +#define PHP_JSON_PRESERVE_ZERO_FRACTION (1<<10) /* Internal flags */ #define PHP_JSON_OUTPUT_ARRAY 0 @@ -89,8 +89,8 @@ ZEND_TSRMLS_CACHE_EXTERN(); #endif /* json_decode() options */ -#define PHP_JSON_OBJECT_AS_ARRAY (1<<0) -#define PHP_JSON_BIGINT_AS_STRING (1<<1) +#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);