com php-src: Export JsonSerializable Interface (bug #65753): ext/json/json.c ext/json/php_json.h

From: Date: Mon, 17 Feb 2014 09:38:51 +0000
Subject: com php-src: Export JsonSerializable Interface (bug #65753): ext/json/json.c ext/json/php_json.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76039@lists.php.net to get a copy of this message
Commit: 8a1d248d4e908a5a210b92f43ec8f36808b7d288 Author: Julien Pauli <jpauli@php.net> Mon, 17 Feb 2014 10:25:40 +0100 Parents: 6877af3f7138d5c7c125c7f1c058e3661772240c Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a1d248d4e908a5a210b92f43ec8f36808b7d288 Log: Export JsonSerializable Interface (bug #65753) Bugs: https://bugs.php.net/65753 Changed paths: M ext/json/json.c M ext/json/php_json.h Diff: diff --git a/ext/json/json.c b/ext/json/json.c index f38cc11..9140096 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 637c5ea..e00de6a 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 */

« previous php.cvs (#76039) next »