Skip to content

Commit

Permalink
Move json_decode options macros bellow encode options
Browse files Browse the repository at this point in the history
  • Loading branch information
bukka committed Sep 4, 2015
1 parent 45fdff1 commit 7fe2646
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ext/json/php_json.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);

Expand Down

0 comments on commit 7fe2646

Please sign in to comment.