stas Tue Jun 30 17:52:21 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/json json.c php_json.h
Log:
fix json shared build on Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19.2.24&r2=1.9.2.19.2.25&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.19.2.24
php-src/ext/json/json.c:1.9.2.19.2.25
--- php-src/ext/json/json.c:1.9.2.19.2.24 Wed Jun 24 17:39:52 2009
+++ php-src/ext/json/json.c Tue Jun 30 17:52:21 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: json.c,v 1.9.2.19.2.24 2009/06/24 17:39:52 felipe Exp $ */
+/* $Id: json.c,v 1.9.2.19.2.25 2009/06/30 17:52:21 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -411,7 +411,7 @@
}
/* }}} */
-PHPAPI void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_DC)
/* {{{ */
+PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options
TSRMLS_DC) /* {{{ */
{
switch (Z_TYPE_P(val))
{
@@ -467,7 +467,7 @@
}
/* }}} */
-PHPAPI void php_json_decode(zval *return_value, char *str, int str_len,
zend_bool assoc, long depth TSRMLS_DC) /* {{{ */
+PHP_JSON_API void php_json_decode(zval *return_value, char *str, int str_len,
zend_bool assoc, long depth TSRMLS_DC) /* {{{ */
{
int utf16_len;
zval *z;
http://cvs.php.net/viewvc.cgi/php-src/ext/json/php_json.h?r1=1.8.2.2.2.7&r2=1.8.2.2.2.8&diff_format=u
Index: php-src/ext/json/php_json.h
diff -u php-src/ext/json/php_json.h:1.8.2.2.2.7
php-src/ext/json/php_json.h:1.8.2.2.2.8
--- php-src/ext/json/php_json.h:1.8.2.2.2.7 Sun May 31 18:55:10 2009
+++ php-src/ext/json/php_json.h Tue Jun 30 17:52:21 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_json.h,v 1.8.2.2.2.7 2009/05/31 18:55:10 andrei Exp $ */
+/* $Id: php_json.h,v 1.8.2.2.2.8 2009/06/30 17:52:21 stas Exp $ */
#ifndef PHP_JSON_H
#define PHP_JSON_H
@@ -27,6 +27,12 @@
extern zend_module_entry json_module_entry;
#define phpext_json_ptr &json_module_entry
+#if defined(PHP_WIN32) && defined(JSON_EXPORTS)
+#define PHP_JSON_API __declspec(dllexport)
+#else
+#define PHP_JSON_API PHPAPI
+#endif
+
#ifdef ZTS
#include "TSRM.h"
#endif
@@ -41,8 +47,8 @@
# define JSON_G(v) (json_globals.v)
#endif
-PHPAPI void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_DC);
-PHPAPI void php_json_decode(zval *return_value, char *str, int str_len,
zend_bool assoc, long depth TSRMLS_DC);
+PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options
TSRMLS_DC);
+PHP_JSON_API void php_json_decode(zval *return_value, char *str, int str_len,
zend_bool assoc, long depth TSRMLS_DC);
#endif /* PHP_JSON_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
