summaryrefslogtreecommitdiffstats
path: root/crypto/dso/dso_dlfcn.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2016-03-22 13:35:03 -0400
committerRich Salz <rsalz@openssl.org>2016-03-22 13:35:03 -0400
commit38186bfd4e5be7f212d8e460420e081e0ad852e7 (patch)
tree136ce20d32a4ee06cb692bada686d8cad80f41dd /crypto/dso/dso_dlfcn.c
parent73decf5975ff1249c51baa0cb3956bb67fbd64dc (diff)
Have only one DSO_METHOD_openssl
Instead of have every DSO_METHOD_xxx in all platforms, ensure that only one DSO_METHOD_openssl is available on all platforms. Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/dso/dso_dlfcn.c')
-rw-r--r--crypto/dso/dso_dlfcn.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index e69daadc4c..09a49131ea 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -67,12 +67,7 @@
#include "dso_locl.h"
-#ifndef DSO_DLFCN
-DSO_METHOD *DSO_METHOD_dlfcn(void)
-{
- return NULL;
-}
-#else
+#ifdef DSO_DLFCN
# ifdef HAVE_DLFCN_H
# ifdef __osf__
@@ -117,9 +112,9 @@ static DSO_METHOD dso_meth_dlfcn = {
dlfcn_globallookup
};
-DSO_METHOD *DSO_METHOD_dlfcn(void)
+DSO_METHOD *DSO_METHOD_openssl(void)
{
- return (&dso_meth_dlfcn);
+ return &dso_meth_dlfcn;
}
/*