diff options
| author | Andy Polyakov <appro@openssl.org> | 2006-01-02 08:59:20 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2006-01-02 08:59:20 +0000 |
| commit | c6cb42e4fba2457c72e17aab2fbe01f411edf6fa (patch) | |
| tree | 874e451b3f7ebfaedf13b84e622d8b8f40abb0bf /crypto/dso/dso_dlfcn.c | |
| parent | 2d43a89488151c39f66d45003ccb4310646516ae (diff) | |
"Relax" prototype and rename DSO_global_lookup_func to DSO_global_lookup.
Diffstat (limited to 'crypto/dso/dso_dlfcn.c')
| -rw-r--r-- | crypto/dso/dso_dlfcn.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index a4ab38f850..d0552c4621 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -99,7 +99,7 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename); static char *dlfcn_merger(DSO *dso, const char *filespec1, const char *filespec2); static int dlfcn_pathbyaddr(void *addr,char *path,int sz); -static DSO_FUNC_TYPE dlfcn_globallookup(const char *name); +static void *dlfcn_globallookup(const char *name); static DSO_METHOD dso_meth_dlfcn = { "OpenSSL 'dlfcn' shared library method", @@ -446,17 +446,16 @@ static int dlfcn_pathbyaddr(void *addr,char *path,int sz) return -1; } -static DSO_FUNC_TYPE dlfcn_globallookup(const char *name) +static void *dlfcn_globallookup(const char *name) { - union { void *p; DSO_FUNC_TYPE f; } ret = { NULL }; - void *handle = dlopen(NULL,RTLD_LAZY); + void *ret = NULL,*handle = dlopen(NULL,RTLD_LAZY); if (handle) { - ret.p = dlsym(handle,name); + ret = dlsym(handle,name); dlclose(handle); } - return ret.f; + return ret; } #endif /* DSO_DLFCN */ |