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

Greg Beaver · Greg Beaver · commit a0624708c7b6 · 2008-01-14T03:16:08.000Z
diff --git 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
@@ -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
