From: Jakub Zelenka <bukka@php.net>
Date: Fri, 4 Sep 2015 18:37:05 +0000 (+0100)
Subject: Move json_decode options macros bellow encode options
X-Git-Tag: php-7.1.0alpha1~1251
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fe2646be320066bb0ea75aa84699aa73ee33a1b;p=php

Move json_decode options macros bellow encode options
---

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);