summaryrefslogtreecommitdiffstats
path: root/crypto/comp
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2001-02-20 08:13:47 +0000
committerRichard Levitte <levitte@openssl.org>2001-02-20 08:13:47 +0000
commitbc36ee6227517edae802bcb0da68d4f04fe1fb5e (patch)
tree19782c56cd5f5930807df5c8bfb4963a05121c48 /crypto/comp
parentf2bc668429fa2abdc77db0db861a9bb2be0c3a85 (diff)
Use new-style system-id macros everywhere possible. I hope I haven't
missed any. This compiles and runs on Linux, and external applications have no problems with it. The definite test will be to build this on VMS.
Diffstat (limited to 'crypto/comp')
-rw-r--r--crypto/comp/c_zlib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index c2ff6c7011..cd2f8a491b 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -48,14 +48,14 @@ static COMP_METHOD zlib_method={
* work. Therefore, all ZLIB routines are loaded at run time
* and we do not link to a .LIB file.
*/
-#if defined(WINDOWS) || defined(WIN32)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
# include <windows.h>
# define Z_CALLCONV _stdcall
# define ZLIB_SHARED
#else
# define Z_CALLCONV
-#endif /* !(WINDOWS || WIN32) */
+#endif /* !(OPENSSL_SYS_WINDOWS || OPENSSL_SYS_WIN32) */
#ifdef ZLIB_SHARED
#include <openssl/dso.h>
@@ -188,7 +188,7 @@ COMP_METHOD *COMP_zlib(void)
#ifdef ZLIB_SHARED
if (!zlib_loaded)
{
-#if defined(WINDOWS) || defined(WIN32)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
zlib_dso = DSO_load(NULL, "ZLIB", NULL, 0);
#else
zlib_dso = DSO_load(NULL, "z", NULL, 0);