stas Mon Jun 22 18:41:13 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json json.c php_json.h
Log:
fix shared build on Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.29&r2=1.9.2.30&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.29 php-src/ext/json/json.c:1.9.2.30
--- php-src/ext/json/json.c:1.9.2.29 Mon Jun 1 14:03:24 2009
+++ php-src/ext/json/json.c Mon Jun 22 18:41:13 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: json.c,v 1.9.2.29 2009/06/01 14:03:24 tony2001 Exp $ */
+/* $Id: json.c,v 1.9.2.30 2009/06/22 18:41:13 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -341,7 +341,7 @@
}
/* }}} */
-PHPAPI void php_json_encode(smart_str *buf, zval *val TSRMLS_DC) /* {{{ */
+PHP_JSON_API void php_json_encode(smart_str *buf, zval *val TSRMLS_DC) /* {{{
*/
{
switch (Z_TYPE_P(val)) {
case IS_NULL:
@@ -393,7 +393,7 @@
}
/* }}} */
-PHPAPI void php_json_decode(zval *return_value, char *buf, int buf_len,
zend_bool assoc TSRMLS_DC) /* {{{ */
+PHP_JSON_API void php_json_decode(zval *return_value, char *buf, int buf_len,
zend_bool assoc TSRMLS_DC) /* {{{ */
{
unsigned short *utf16;
int utf16_len;
http://cvs.php.net/viewvc.cgi/php-src/ext/json/php_json.h?r1=1.8.2.7&r2=1.8.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.7 php-src/ext/json/php_json.h:1.8.2.8
--- php-src/ext/json/php_json.h:1.8.2.7 Mon Jun 1 14:03:24 2009
+++ php-src/ext/json/php_json.h Mon Jun 22 18:41:13 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_json.h,v 1.8.2.7 2009/06/01 14:03:24 tony2001 Exp $ */
+/* $Id: php_json.h,v 1.8.2.8 2009/06/22 18:41:13 stas Exp $ */
#ifndef PHP_JSON_H
#define PHP_JSON_H
@@ -44,8 +44,8 @@
#define JSON_G(v) (json_globals.v)
#endif
-PHPAPI void php_json_encode(smart_str *buf, zval *val TSRMLS_DC);
-PHPAPI void php_json_decode(zval *return_value, char *buf, int buf_len,
zend_bool assoc TSRMLS_DC);
+PHP_JSON_API void php_json_encode(smart_str *buf, zval *val TSRMLS_DC);
+PHP_JSON_API void php_json_decode(zval *return_value, char *buf, int buf_len,
zend_bool assoc TSRMLS_DC);
#endif /* PHP_JSON_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
