diff options
Diffstat (limited to 'ext/json/JSON_parser.h')
| -rw-r--r-- | ext/json/JSON_parser.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ext/json/JSON_parser.h b/ext/json/JSON_parser.h index 746190bb3..541664b8c 100644 --- a/ext/json/JSON_parser.h +++ b/ext/json/JSON_parser.h @@ -5,6 +5,7 @@ #include "php.h" #include "ext/standard/php_smart_str.h" +#include "php_json.h" #define JSON_PARSER_DEFAULT_DEPTH 512 @@ -28,6 +29,12 @@ enum error_codes { }; extern JSON_parser new_JSON_parser(int depth); -extern int parse_JSON(JSON_parser jp, zval *z, unsigned short utf16_json[], int length, int assoc TSRMLS_DC); +extern int parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length, int options TSRMLS_DC); extern int free_JSON_parser(JSON_parser jp); + +static inline int parse_JSON(JSON_parser jp, zval *z, unsigned short utf16_json[], int length, int assoc TSRMLS_DC) +{ + return parse_JSON_ex(jp, z, utf16_json, length, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0 TSRMLS_CC); +} + #endif |