moriyoshi Sat Nov 22 08:38:47 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/iconv iconv.c
Log:
MFH(r-1.98): Fixed bug #26194 (iconv() not properly defined with libiconv).
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.65.2.11 php-src/ext/iconv/iconv.c:1.65.2.12
--- php-src/ext/iconv/iconv.c:1.65.2.11 Thu Aug 28 16:05:24 2003
+++ php-src/ext/iconv/iconv.c Sat Nov 22 08:38:46 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.65.2.11 2003/08/28 20:05:24 iliaa Exp $ */
+/* $Id: iconv.c,v 1.65.2.12 2003/11/22 13:38:46 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -46,6 +46,10 @@
#include <gnu/libc-version.h>
#endif
+#ifdef HAVE_LIBICONV
+#undef iconv
+#endif
+
/* {{{ iconv_functions[]
*/
function_entry iconv_functions[] = {
@@ -91,6 +95,10 @@
} php_iconv_err_t;
/* }}} */
+#ifdef HAVE_LIBICONV
+#define iconv libiconv
+#endif
+
/* {{{ prototypes */
static php_iconv_err_t php_iconv_string(const char * in_p, size_t in_len, char **out,
size_t *out_len, const char *in_charset, const char *out_charset);
static void _php_iconv_show_error(php_iconv_err_t err, const char *in_charset, const
char *out_charset TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
