From: Greg Beaver <cellog@php.net>
Date: Mon, 14 Jan 2008 03:15:50 +0000 (+0000)
Subject: MFPECL: fix windows build for all cases, and always export symbols (Steph Fox)
X-Git-Tag: RELEASE_2_0_0a1~915
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c8c279a555ff1ebecc13d9cdd672be85f6d6df6;p=php

MFPECL: 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 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 468155569f..6af8451b56 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