diff options
| author | andrey <andrey@php.net> | 2012-07-09 17:59:42 +0300 |
|---|---|---|
| committer | andrey <andrey@php.net> | 2012-07-09 17:59:42 +0300 |
| commit | 66e1ac23c1601abb66fa78bff87453e5e37a9377 (patch) | |
| tree | 19b707c38dda43d747dd923ac05974632bcb07fc /ext/json/JSON_parser.h | |
| parent | 555db7dc4ecaffdbfb4a10f4d00ddd81c0f89ef6 (diff) | |
| parent | 2032470e4113dfbf04a1ed3b12de85ffcde6f367 (diff) | |
| download | php-git-66e1ac23c1601abb66fa78bff87453e5e37a9377.tar.gz | |
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Diffstat (limited to 'ext/json/JSON_parser.h')
| -rw-r--r-- | ext/json/JSON_parser.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/json/JSON_parser.h b/ext/json/JSON_parser.h index 8671765b4d..541664b8c6 100644 --- a/ext/json/JSON_parser.h +++ b/ext/json/JSON_parser.h @@ -25,10 +25,7 @@ enum error_codes { PHP_JSON_ERROR_STATE_MISMATCH, PHP_JSON_ERROR_CTRL_CHAR, PHP_JSON_ERROR_SYNTAX, - PHP_JSON_ERROR_UTF8, - PHP_JSON_ERROR_RECURSION, - PHP_JSON_ERROR_INF_OR_NAN, - PHP_JSON_ERROR_UNSUPPORTED_TYPE + PHP_JSON_ERROR_UTF8 }; extern JSON_parser new_JSON_parser(int depth); |