diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/json/php_json_parser.h | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'ext/json/php_json_parser.h')
| -rw-r--r-- | ext/json/php_json_parser.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/json/php_json_parser.h b/ext/json/php_json_parser.h index 7912b79b9c..08c3ee1287 100644 --- a/ext/json/php_json_parser.h +++ b/ext/json/php_json_parser.h @@ -27,12 +27,9 @@ typedef struct _php_json_parser { zval *return_value; long depth; long max_depth; -#if ZTS - void *zts_ctx; -#endif } php_json_parser; -void php_json_parser_init(php_json_parser *parser, zval *return_value, char *str, int str_len, long options, long max_depth TSRMLS_DC); +void php_json_parser_init(php_json_parser *parser, zval *return_value, char *str, int str_len, long options, long max_depth); php_json_error_code php_json_parser_error_code(php_json_parser *parser); |