diff options
| author | Greg Beaver <cellog@php.net> | 2008-01-14 03:16:08 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2008-01-14 03:16:08 +0000 |
| commit | a0624708c7b6e2ca4022c3a504e1e02427d1f29a (patch) | |
| tree | 3b98127220f910cdc9224a3d45b3f9c08d4da32a | |
| parent | 42ef796add92780459492c1b109139ad2d9ff1e3 (diff) | |
| download | php-git-a0624708c7b6e2ca4022c3a504e1e02427d1f29a.tar.gz | |
MFH: fix windows build for all cases, and always export symbols (Steph Fox)
| -rw-r--r-- | ext/zip/config.w32 | 4 | ||||
| -rw-r--r-- | ext/zip/lib/zip.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32 index e698f94f3a..a8ae4f1223 100644 --- a/ext/zip/config.w32 +++ b/ext/zip/config.w32 @@ -31,9 +31,7 @@ if (PHP_ZIP != "no") { AC_DEFINE('HAVE_ZLIB', 1); AC_DEFINE('HAVE_ZIP', 1); - if (PHP_ZIP_SHARED) { - ADD_FLAG("CFLAGS_ZIP", "/D PHP_ZIP_EXPORTS "); - } + ADD_FLAG("CFLAGS_ZIP", "/D PHP_ZIP_EXPORTS "); } else { WARNING("zip not enabled; libraries and headers not found"); } diff --git a/ext/zip/lib/zip.h b/ext/zip/lib/zip.h index a0ff660442..04ffb1471b 100644 --- a/ext/zip/lib/zip.h +++ b/ext/zip/lib/zip.h @@ -44,8 +44,6 @@ #include "zip_win32.h" # ifdef PHP_ZIP_EXPORTS # define PHPZIPAPI __declspec(dllexport) -# elif defined(COMPILE_DL_ZIP) -# define PHPZIPAPI __declspec(dllimport) # else # define PHPZIPAPI # endif |