diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-11-22 13:36:55 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-11-22 13:36:55 +0000 |
| commit | fd28ad3e8cf7746332b7f85fea7941b7cc0596f1 (patch) | |
| tree | f8a5437007c83ba72d0b8ab9c5710b7e53a51893 | |
| parent | 4508d7dccec84c9370531d5efabb3bec6529704e (diff) | |
| download | php-git-fd28ad3e8cf7746332b7f85fea7941b7cc0596f1.tar.gz | |
Fixed bug #26194 (iconv() not properly defined with libiconv).
# Thank you Steph and Frank!
| -rw-r--r-- | ext/iconv/iconv.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 00a7428b99..8c15128c26 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -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 @@ typedef enum _php_iconv_enc_scheme_t { } 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); |