From: Richard Levitte <levitte@openssl.org>
Date: Sat, 18 Jun 2005 04:32:12 +0000 (+0000)
Subject: Only define ZLIB_SHARED if it hasn't already been defined (on the command
X-Git-Tag: OpenSSL_0_9_8k^2~2009
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=283c3e24371f1bc5d54e01c09375e60258d1f921;p=oweals%2Fopenssl.git

Only define ZLIB_SHARED if it hasn't already been defined (on the command
line, for example).

PR: 1112
---

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 171fa5b86b..8263f7315d 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -73,7 +73,9 @@ static COMP_METHOD zlib_stateful_method={
 # include <windows.h>
 
 # define Z_CALLCONV _stdcall
-# define ZLIB_SHARED
+# ifndef ZLIB_SHARED
+#  define ZLIB_SHARED
+# endif
 #else
 # define Z_CALLCONV
 #endif /* !(OPENSSL_SYS_WINDOWS || OPENSSL_SYS_WIN32) */