cvs: php-src(PHP_5_0) /ext/iconv iconv.c
| From: | Antony Dovgal | Date: | Fri, 13 Aug 2004 14:54:50 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28331@lists.php.net to get a copy of this message | ||
tony2001 Fri Aug 13 10:54:50 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/iconv iconv.c
Log:
MFH: fix compile warning
http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.117.2.2&r2=1.117.2.3&ty=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.117.2.2 php-src/ext/iconv/iconv.c:1.117.2.3
--- php-src/ext/iconv/iconv.c:1.117.2.2 Tue Jul 20 14:48:23 2004
+++ php-src/ext/iconv/iconv.c Fri Aug 13 10:54:50 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.117.2.2 2004/07/20 18:48:23 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.117.2.3 2004/08/13 14:54:50 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2457,7 +2457,7 @@
while (icnt > 0) {
if ((ps == NULL ? iconv(self->cd, NULL, NULL, &pd, &ocnt):
- iconv(self->cd, &ps, &icnt, &pd, &ocnt)) == (size_t)-1) {
+ iconv(self->cd, (char **)&ps, &icnt, &pd, &ocnt)) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EILSEQ: