summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorAndrea Faulds <ajf@ajf.me>2017-10-22 19:41:23 +0100
committerAndrea Faulds <ajf@ajf.me>2017-10-22 19:41:23 +0100
commite823770515bd0530bd3c09ea273c720b4df33734 (patch)
tree0d33cb3518feb5efa23114198ad9377d030e0900 /ext/json/php_json.h
parentd5127cec6ae020a23624a1d4e9da342a33d90cc0 (diff)
downloadphp-git-e823770515bd0530bd3c09ea273c720b4df33734.tar.gz
Merge JSON_THROW_ON_ERROR
Diffstat (limited to 'ext/json/php_json.h')
-rw-r--r--ext/json/php_json.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index cfd6ca4816..900329fa74 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -74,6 +74,7 @@ typedef enum {
/* json_decode() and json_encode() common options */
#define PHP_JSON_INVALID_UTF8_IGNORE (1<<20)
#define PHP_JSON_INVALID_UTF8_SUBSTITUTE (1<<21)
+#define PHP_JSON_THROW_ON_ERROR (1<<22)
/* Internal flags */
#define PHP_JSON_OUTPUT_ARRAY 0