From: Edin Kadribasic <edink@php.net>
Date: Tue, 23 Nov 2004 12:07:25 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.0.3RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74d23c256bd2015d96770f8b94e94258e9dd2fe8;p=php

MFH
---

diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32
index d6e0f8a920..8b38e2c37b 100644
--- a/ext/iconv/config.w32
+++ b/ext/iconv/config.w32
@@ -12,8 +12,10 @@ if (PHP_ICONV != "no") {
 		AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available");
 		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 ");
 		if (!PHP_ICONV_SHARED) {
 			ADD_DEF_FILE("ext\\iconv\\php_iconv.def");
 		}
 	}
 }
+
diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
index fbe4404bb6..b162dfa70f 100644
--- a/ext/iconv/php_iconv.h
+++ b/ext/iconv/php_iconv.h
@@ -23,8 +23,12 @@
 #define PHP_ICONV_H
 
 #ifdef PHP_WIN32
+#ifdef PHP_ICONV_EXPORTS
 #define PHP_ICONV_API __declspec(dllexport)
 #else
+#define PHP_ICONV_API __declspec(dllimport)
+#endif 
+#else
 #define PHP_ICONV_API
 #endif