summaryrefslogtreecommitdiffstats
path: root/crypto/dso
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-03-31 16:15:02 +0200
committerRichard Levitte <levitte@openssl.org>2019-04-01 06:14:50 +0200
commit31b6ed76dfd53529b74e79830c81372d0b756929 (patch)
treeea7a958315ceddda691ffc562cdff54578153d4a /crypto/dso
parent9c119bc6b54f4851898134db28c2a01947b5efba (diff)
Rework DSO API conditions and configuration option
'no-dso' is meaningless, as it doesn't get any macro defined. Therefore, we remove all checks of OPENSSL_NO_DSO. However, there may be some odd platforms with no DSO scheme. For those, we generate the internal macro DSO_NONE aand use it. Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/#8622)
Diffstat (limited to 'crypto/dso')
-rw-r--r--crypto/dso/dso_openssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/dso/dso_openssl.c b/crypto/dso/dso_openssl.c
index d834b2ecaf..0e2443804c 100644
--- a/crypto/dso/dso_openssl.c
+++ b/crypto/dso/dso_openssl.c
@@ -9,7 +9,7 @@
#include "dso_locl.h"
-#if !defined(DSO_VMS) && !defined(DSO_DLCFN) && !defined(DSO_DL) && !defined(DSO_WIN32) && !defined(DSO_DLFCN)
+#ifdef DSO_NONE
static DSO_METHOD dso_meth_null = {
"NULL shared library method"