helly Sat Oct 29 11:44:37 2005 EDT
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
- Fix stupid unicode warnings
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.94&r2=1.95&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.94
php-src/ext/spl/spl_iterators.c:1.95
--- php-src/ext/spl/spl_iterators.c:1.94 Sat Oct 29 11:37:57 2005
+++ php-src/ext/spl/spl_iterators.c Sat Oct 29 11:44:37 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.94 2005/10/29 15:37:57 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.95 2005/10/29 15:44:37 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -474,7 +474,7 @@
RETURN_STRINGL(str_key, str_key_len-1, 0);
break;
case HASH_KEY_IS_UNICODE:
- RETURN_UNICODEL(str_key, str_key_len-1, 0);
+ RETURN_UNICODEL((void*)str_key, str_key_len-1,
0);
break;
case HASH_KEY_IS_BINARY:
RETURN_BINARYL(str_key, str_key_len-1, 0);
@@ -1734,7 +1734,7 @@
if (intern->current.key_type == HASH_KEY_IS_STRING) {
RETURN_STRINGL(intern->current.str_key,
intern->current.str_key_len, 1);
} else if (intern->current.key_type == HASH_KEY_IS_UNICODE) {
- RETURN_UNICODEL(intern->current.str_key,
intern->current.str_key_len, 1);
+ RETURN_UNICODEL((void*)intern->current.str_key,
intern->current.str_key_len, 1);
} else if (intern->current.key_type == HASH_KEY_IS_BINARY) {
RETURN_BINARYL(intern->current.str_key,
intern->current.str_key_len, 1);
} else {
@@ -2053,7 +2053,7 @@
RETURN_STRINGL(str_key, str_key_len-1, 0);
break;
case HASH_KEY_IS_UNICODE:
- RETURN_UNICODEL(str_key, str_key_len-1, 0);
+ RETURN_UNICODEL((void*)str_key, str_key_len-1,
0);
break;
case HASH_KEY_IS_BINARY:
RETURN_BINARYL(str_key, str_key_len-1, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
