MFH: fix windows build for all cases, and always export symbols (Steph Fox)

diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
index e698f94f3a4117761da6b5f5ff51b35f590a778c..a8ae4f1223e1fffa71daccbd1ea12b916cce5b04 100644 (file)
--- 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 a0ff660442ae5c2f0332f07747b9b1ac8ca34ded..04ffb1471b5544b0f433ebb6c2429f9b1ef73715 100644 (file)
--- 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