archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into jsond

Browse source 
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
This commit is contained in:
Jakub Zelenka 2014-12-27 19:42:04 +00:00
commit b68da91d52
1618 changed files with 33190 additions and 32817 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/json/php_json_parser.h
View file

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