From 6d23aae34e02f9dc299e64b5e664678d1fa6566d Mon Sep 17 00:00:00 2001 From: Edin Kadribasic Date: Tue, 23 Nov 2004 12:04:07 +0000 Subject: Only dllexport during the compilation of iconv.c --- ext/iconv/config.w32 | 1 + ext/iconv/php_iconv.h | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'ext/iconv') diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32 index 22dc46607f..8b38e2c37b 100644 --- a/ext/iconv/config.w32 +++ b/ext/iconv/config.w32 @@ -12,6 +12,7 @@ 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 -- cgit v1.2.1