moriyoshi Sat Nov 22 08:36:56 2003 EDT
Modified files:
/php-src/ext/iconv iconv.c
Log:
Fixed bug #26194 (iconv() not properly defined with libiconv).
# Thank you Steph and Frank!
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.97 php-src/ext/iconv/iconv.c:1.98
--- php-src/ext/iconv/iconv.c:1.97 Sun Nov 2 13:54:08 2003
+++ php-src/ext/iconv/iconv.c Sat Nov 22 08:36:55 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.97 2003/11/02 18:54:08 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.98 2003/11/22 13:36:55 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -51,6 +51,10 @@
#include <gnu/libc-version.h>
#endif
+#ifdef HAVE_LIBICONV
+#undef iconv
+#endif
+
#include "ext/standard/php_smart_str.h"
#include "ext/standard/base64.h"
#include "ext/standard/quot_print.h"
@@ -117,6 +121,10 @@
} php_iconv_enc_scheme_t;
/* }}} */
+#ifdef HAVE_LIBICONV
+#define iconv libiconv
+#endif
+
/* {{{ prototypes */
static php_iconv_err_t _php_iconv_appendl(smart_str *d, const char *s, size_t l,
iconv_t cd);
static php_iconv_err_t _php_iconv_appendc(smart_str *d, const char c, iconv_t cd);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
