diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2014-04-27 16:06:50 -0400 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2014-05-06 18:10:17 -0400 |
| commit | 804ab36df6eafd4ab26e834bc3f746f65c0b7441 (patch) | |
| tree | 4c7fba43e56cedf0d9181d20da821dea96b8fb3e /crypto/dso | |
| parent | a41d5174e27c99d1caefd76a8e927c814ede509e (diff) | |
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 <geoff@openssl.org>
Diffstat (limited to 'crypto/dso')
| -rw-r--r-- | crypto/dso/dso_vms.c | 16 |
1 files changed, 8 insertions, 8 deletions
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 <errno.h> #include "cryptlib.h" #include <openssl/dso.h> -#ifdef OPENSSL_SYS_VMS + +#ifndef OPENSSL_SYS_VMS +DSO_METHOD *DSO_METHOD_vms(void) + { + return NULL; + } +#else + #pragma message disable DOLLARID #include <rms.h> #include <lib$routines.h> @@ -69,7 +76,6 @@ #include <descrip.h> #include <starlet.h> #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); |