generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dso: eliminate VMS code on non-VMS systems

Browse Source 
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>
This commit is contained in:
Geoff Thorpe 2014-04-27 16:06:50 -04:00
parent e5676b8328
commit da12bfca51
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crypto/dso/dso_vms.c
View File

@ -61,7 +61,14 @@
#include <errno.h> #include <errno.h>
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/dso.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 #pragma message disable DOLLARID
#include <rms.h> #include <rms.h>
#include <lib$routines.h> #include <lib$routines.h>
@ -69,7 +76,6 @@
#include <descrip.h> #include <descrip.h>
#include <starlet.h> #include <starlet.h>
#include "vms_rms.h" #include "vms_rms.h"
#endif
/* Some compiler options may mask the declaration of "_malloc32". */ /* Some compiler options may mask the declaration of "_malloc32". */
#if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE #if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
@ -82,12 +88,6 @@
#endif /* __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE */ #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 #pragma message disable DOLLARID
static int vms_load(DSO *dso); static int vms_load(DSO *dso);