tony2001 Wed Aug 2 22:02:12 2006 UTC
Modified files:
/php-src/ext/wddx wddx.c
Log:
fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.138&r2=1.139&diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.138 php-src/ext/wddx/wddx.c:1.139
--- php-src/ext/wddx/wddx.c:1.138 Wed Aug 2 15:45:29 2006
+++ php-src/ext/wddx/wddx.c Wed Aug 2 22:02:12 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.138 2006/08/02 15:45:29 iliaa Exp $ */
+/* $Id: wddx.c,v 1.139 2006/08/02 22:02:12 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -367,7 +367,7 @@
/* {{{ php_wddx_serialize_string
*/
-static void php_wddx_serialize_string(wddx_packet *packet, zval *var)
+static void php_wddx_serialize_string(wddx_packet *packet, zval *var TSRMLS_DC)
{
php_wddx_add_chunk_static(packet, WDDX_STRING_S);
@@ -608,7 +608,7 @@
switch(Z_TYPE_P(var)) {
case IS_STRING:
- php_wddx_serialize_string(packet, var);
+ php_wddx_serialize_string(packet, var TSRMLS_CC);
break;
case IS_LONG:
@@ -1329,7 +1329,7 @@
else if (Z_TYPE_P(packet) == IS_RESOURCE) {
php_stream_from_zval(stream, &packet);
if (stream) {
- payload_len = php_stream_copy_to_mem(stream, &payload,
PHP_STREAM_COPY_ALL, 0);
+ payload_len = php_stream_copy_to_mem(stream, (void
**)&payload, PHP_STREAM_COPY_ALL, 0);
}
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expecting
parameter 1 to be a string or a stream");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
