archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #26194 (iconv() not properly defined with libiconv).

Browse source 
# Thank you Steph and Frank!
This commit is contained in:
Moriyoshi Koizumi 2003-11-22 13:36:55 +00:00
parent 4508d7dcce
commit fd28ad3e8c
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/iconv/iconv.c
View file

@ -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);