php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Moriyoshi Koizumi
2003-11-22 13:38:46 +00:00
parent d3e82a6876
commit d95ee6d92a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/iconv/iconv.c
+8
View File
@@ -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);