From: Kalle Sommer Nielsen <kalle@php.net>
Date: Mon, 8 Mar 2010 14:04:35 +0000 (+0000)
Subject: Fix linking of iconv on Windows
X-Git-Tag: php-5.4.0alpha1~214
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b961634c5a28c401d81ed473c064ca9ad8114a8e;p=php

Fix linking of iconv on Windows
---

diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32
index b78c540021..6baa182c03 100644
--- a/ext/iconv/config.w32
+++ b/ext/iconv/config.w32
@@ -12,6 +12,7 @@ if (PHP_ICONV != "no") {
 		
 		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 ");