From: Geoff Thorpe Date: Sun, 27 Apr 2014 20:06:50 +0000 (-0400) Subject: dso: eliminate VMS code on non-VMS systems X-Git-Tag: OpenSSL_1_0_1h~60 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=804ab36df6eafd4ab26e834bc3f746f65c0b7441;p=oweals%2Fopenssl.git dso: eliminate VMS code on non-VMS systems Even though the meat of dso_vms.c is compiled out on non-VMS builds, the (pre-)compiler still traverses some of the macro handling. This trips up at least one non-VMS build configuration, so this commit makes the skip-VMS case more robust. Signed-off-by: Geoff Thorpe --- diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c index eee20d14f1..868513c391 100644 --- a/crypto/dso/dso_vms.c +++ b/crypto/dso/dso_vms.c @@ -61,7 +61,14 @@ #include #include "cryptlib.h" #include -#ifdef OPENSSL_SYS_VMS + +#ifndef OPENSSL_SYS_VMS +DSO_METHOD *DSO_METHOD_vms(void) + { + return NULL; + } +#else + #pragma message disable DOLLARID #include #include @@ -69,7 +76,6 @@ #include #include #include "vms_rms.h" -#endif /* Some compiler options may mask the declaration of "_malloc32". */ #if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE @@ -82,12 +88,6 @@ #endif /* __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE */ -#ifndef OPENSSL_SYS_VMS -DSO_METHOD *DSO_METHOD_vms(void) - { - return NULL; - } -#else #pragma message disable DOLLARID static int vms_load(DSO *dso);