summaryrefslogtreecommitdiffstats
path: root/crypto/comp
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2005-06-18 04:32:12 +0000
committerRichard Levitte <levitte@openssl.org>2005-06-18 04:32:12 +0000
commit283c3e24371f1bc5d54e01c09375e60258d1f921 (patch)
treeb1e9a52dd4721e49154e59e7b63a5fd7581646e7 /crypto/comp
parent306aae6ceea52d23fb9104edc3a672344d356fe3 (diff)
Only define ZLIB_SHARED if it hasn't already been defined (on the command
line, for example). PR: 1112
Diffstat (limited to 'crypto/comp')
-rw-r--r--crypto/comp/c_zlib.c4
1 files changed, 3 insertions, 1 deletions
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) */