moriyoshi Thu Nov 14 18:07:53 2002 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Fixed a problem that ICONV_IMPL doesn't give a correct value in win32 build.
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.65 php4/ext/iconv/iconv.c:1.66
--- php4/ext/iconv/iconv.c:1.65 Fri Nov 8 13:40:54 2002
+++ php4/ext/iconv/iconv.c Thu Nov 14 18:07:53 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.65 2002/11/08 18:40:54 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.66 2002/11/14 23:07:53 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -146,6 +146,8 @@
#ifdef PHP_ICONV_IMPL
REGISTER_STRING_CONSTANT("ICONV_IMPL", PHP_ICONV_IMPL, CONST_CS |
CONST_PERSISTENT);
+#elif HAVE_LIBICONV
+ REGISTER_STRING_CONSTANT("ICONV_IMPL", "libiconv", CONST_CS |
+CONST_PERSISTENT);
#else
REGISTER_STRING_CONSTANT("ICONV_IMPL", "unknown", CONST_CS | CONST_PERSISTENT);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
