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/php_json.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/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index afeff3f6cc..ef3e4b5a79 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -63,7 +63,6 @@ extern zend_class_entry *php_json_serializable_ce; #define PHP_JSON_UNESCAPED_SLASHES (1<<6) #define PHP_JSON_PRETTY_PRINT (1<<7) #define PHP_JSON_UNESCAPED_UNICODE (1<<8) -#define PHP_JSON_PARTIAL_OUTPUT_ON_ERROR (1<<9) /* Internal flags */ #define PHP_JSON_OUTPUT_ARRAY 0 |