mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-15 12:54:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed possible compile-time failure

Browse Source
This commit is contained in:
Moriyoshi Koizumi 2002-10-11 17:01:34 +00:00
parent e7b49d64a6
commit adbdd71dc8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/iconv/iconv.c
View File

@ -106,7 +106,6 @@ static void php_iconv_init_globals(zend_iconv_globals *iconv_globals)
PHP_MINIT_FUNCTION(miconv)
{
char *impl_name = "unknown";
char *version = "";
ZEND_INIT_MODULE_GLOBALS(iconv, php_iconv_init_globals, NULL);
@ -115,14 +114,16 @@ PHP_MINIT_FUNCTION(miconv)
#if HAVE_LIBICONV
{
static char buf[16];
impl_name = "libiconv";
snprintf(buf, sizeof(buf), "%d.%d",
((_libiconv_version >> 8) & 0x0f), (_libiconv_version & 0x0f));
version = buf;
}
#endif
#ifdef ICONV_IMPL
REGISTER_STRING_CONSTANT("ICONV_IMPL", ICONV_IMPL, CONST_CS | CONST_PERSISTENT);
#else
REGISTER_STRING_CONSTANT("ICONV_IMPL", "unknown", CONST_CS | CONST_PERSISTENT);
#endif
REGISTER_STRING_CONSTANT("ICONV_VERSION", version, CONST_CS | CONST_PERSISTENT);
return SUCCESS;