MFH

diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32
index d6e0f8a9200b995107438e81bfa7d21a47fa8d4e..8b38e2c37b5f7b75504a99a3dbee23e25b4bf627 100644 (file)
--- 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 fbe4404bb6bd3892f4627ec673f85be632faa0d5..b162dfa70f0948281e43fbf6b68d5108cea76797 100644 (file)
--- 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