diff options
| author | Julien Pauli <jpauli@php.net> | 2014-02-17 10:36:13 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-02-17 10:36:13 +0100 |
| commit | baafdad1503943150617654240780a170156d92a (patch) | |
| tree | adacca06b96aa457d738b7e5eddcfaa4457b8bba | |
| parent | f7f524aada86241c6c0e3c9ae2e7bdbfd533089e (diff) | |
| parent | 786234d351c40a9b4808d1dd13d2f91f2f5314be (diff) | |
| download | php-git-baafdad1503943150617654240780a170156d92a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Export JsonSerializable Interface (bug #65753)
| -rw-r--r-- | ext/json/json.c | 2 | ||||
| -rw-r--r-- | ext/json/php_json.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 4ab6278d76..b0191c38f5 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -39,7 +39,7 @@ static PHP_FUNCTION(json_last_error_msg); static const char digits[] = "0123456789abcdef"; -zend_class_entry *php_json_serializable_ce; +PHP_JSON_API zend_class_entry *php_json_serializable_ce; ZEND_DECLARE_MODULE_GLOBALS(json) diff --git a/ext/json/php_json.h b/ext/json/php_json.h index 637c5eae5e..e00de6a27b 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -51,7 +51,7 @@ ZEND_END_MODULE_GLOBALS(json) PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_DC); PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, int str_len, int options, long depth TSRMLS_DC); -extern zend_class_entry *php_json_serializable_ce; +extern PHP_JSON_API zend_class_entry *php_json_serializable_ce; /* json_encode() options */ |