kalle Mon, 08 Mar 2010 14:04:35 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=295962
Log:
Fix linking of iconv on Windows
Changed paths:
U php/php-src/branches/PHP_5_2/ext/iconv/config.w32
U php/php-src/branches/PHP_5_3/ext/iconv/config.w32
U php/php-src/trunk/ext/iconv/config.w32
Modified: php/php-src/branches/PHP_5_2/ext/iconv/config.w32
===================================================================
--- php/php-src/branches/PHP_5_2/ext/iconv/config.w32 2010-03-08 14:03:42 UTC
(rev 295961)
+++ php/php-src/branches/PHP_5_2/ext/iconv/config.w32 2010-03-08 14:04:35 UTC
(rev 295962)
@@ -10,6 +10,7 @@
AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is
enabled");
AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is
available");
+ AC_DEFINE("HAVE_LIBICONV_IN_LIBICONV", 1, "The iconv function
is called iconv() in libiconv");
AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv
implementation to use");
AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports
errno or not");
ADD_FLAG("CFLAGS_ICONV", "/D PHP_ICONV_EXPORTS ");
Modified: php/php-src/branches/PHP_5_3/ext/iconv/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/ext/iconv/config.w32 2010-03-08 14:03:42 UTC
(rev 295961)
+++ php/php-src/branches/PHP_5_3/ext/iconv/config.w32 2010-03-08 14:04:35 UTC
(rev 295962)
@@ -12,6 +12,7 @@
AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is
enabled");
AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is
available");
+ AC_DEFINE("HAVE_LIBICONV_IN_LIBICONV", 1, "The iconv function
is called iconv() in libiconv");
AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv
implementation to use");
AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports
errno or not");
ADD_FLAG("CFLAGS_ICONV", "/D PHP_ICONV_EXPORTS ");
Modified: php/php-src/trunk/ext/iconv/config.w32
===================================================================
--- php/php-src/trunk/ext/iconv/config.w32 2010-03-08 14:03:42 UTC (rev
295961)
+++ php/php-src/trunk/ext/iconv/config.w32 2010-03-08 14:04:35 UTC (rev
295962)
@@ -12,6 +12,7 @@
AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is
enabled");
AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is
available");
+ AC_DEFINE("HAVE_LIBICONV_IN_LIBICONV", 1, "The iconv function
is called iconv() in libiconv");
AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv
implementation to use");
AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports
errno or not");
ADD_FLAG("CFLAGS_ICONV", "/D PHP_ICONV_EXPORTS ");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
