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

From: Date: Mon, 17 Feb 2014 09:25:40 +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-76037@lists.php.net to get a copy of this message
Commit: 786234d351c40a9b4808d1dd13d2f91f2f5314be Author: Julien Pauli <jpauli@php.net> Mon, 17 Feb 2014 10:25:40 +0100 Parents: f275fdcf0095a108c33f2843011c6fac54216121 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=786234d351c40a9b4808d1dd13d2f91f2f5314be 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 5b85b28..37ee314 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -38,7 +38,7 @@ static PHP_FUNCTION(json_last_error); 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 a306d2d..9ad2eca 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -50,7 +50,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 (#76037) next »