diff options
| author | Nikita Popov <nikic@php.net> | 2012-07-01 16:38:26 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-07-01 16:38:26 +0200 |
| commit | b7903f9778a57fda71867f9661505f635d602067 (patch) | |
| tree | da77c7465af291947147fbb3ffc67dec641aeb58 /ext/json/php_json.h | |
| parent | 9cbd7a24b6d1d61e51fd6d32669dcfa1df30c883 (diff) | |
| download | php-git-b7903f9778a57fda71867f9661505f635d602067.tar.gz | |
Revert JSON merges to 5.4
This reverts the following merge commits (-m 1):
405ebfcd182a39f0960ff7d7055d49053d3e0316
d372b33c9b941be9a795bf3705bd22dc5f6092c3
36fa17a5fae84ab332366a202f0a709279a2466a
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 |