From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Sat, 22 Nov 2003 13:38:46 +0000 (+0000)
Subject: MFH(r-1.98): Fixed bug #26194 (iconv() not properly defined with libiconv).
X-Git-Tag: php-4.3.5RC1~181
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d95ee6d92a95c71d3fc2481791c56ca17ef5ee85;p=php

MFH(r-1.98): Fixed bug #26194 (iconv() not properly defined with libiconv).
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index c885bd9c28..e4061f52bf 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -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 @@ typedef enum _php_iconv_err_t {
 } 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);