diff options
| author | Edin Kadribasic <edink@php.net> | 2004-11-23 12:04:07 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2004-11-23 12:04:07 +0000 |
| commit | 6d23aae34e02f9dc299e64b5e664678d1fa6566d (patch) | |
| tree | 4153266c2fae6996fd6285f7e46d8398eff6415e /ext/iconv | |
| parent | ce022d2723f58e4620e6a73a9705ac893f14594c (diff) | |
| download | php-git-6d23aae34e02f9dc299e64b5e664678d1fa6566d.tar.gz | |
Only dllexport during the compilation of iconv.c
Diffstat (limited to 'ext/iconv')
| -rw-r--r-- | ext/iconv/config.w32 | 1 | ||||
| -rw-r--r-- | ext/iconv/php_iconv.h | 4 |
2 files changed, 5 insertions, 0 deletions
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 |