On Fri, 11 Oct 2002, Moriyoshi Koizumi wrote:
> moriyoshi Fri Oct 11 13:01:35 2002 EDT
>
> Modified files:
> /php4/ext/iconv iconv.c
> Log:
> Fixed possible compile-time failure
Why did you do this? the define is always set through the config.m4
file...
Derick
>
>
>
> Index: php4/ext/iconv/iconv.c
> diff -u php4/ext/iconv/iconv.c:1.51 php4/ext/iconv/iconv.c:1.52
> --- php4/ext/iconv/iconv.c:1.51 Fri Oct 11 04:15:05 2002
> +++ php4/ext/iconv/iconv.c Fri Oct 11 13:01:34 2002
> @@ -17,7 +17,7 @@
> +----------------------------------------------------------------------+
> */
>
> -/* $Id: iconv.c,v 1.51 2002/10/11 08:15:05 derick Exp $ */
> +/* $Id: iconv.c,v 1.52 2002/10/11 17:01:34 moriyoshi Exp $ */
>
> #ifdef HAVE_CONFIG_H
> #include "config.h"
> @@ -106,7 +106,6 @@
>
> PHP_MINIT_FUNCTION(miconv)
> {
> - char *impl_name = "unknown";
> char *version = "";
>
> ZEND_INIT_MODULE_GLOBALS(iconv, php_iconv_init_globals, NULL);
> @@ -115,14 +114,16 @@
> #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;
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
--
---------------------------------------------------------------------------
Derick Rethans http://derickrethans.nl/
JDI Media Solutions
--------------[ if you hold a unix shell to your ear, do you hear the c? ]-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
