From 08a7ccf232e0f04f8a0a66bec07db566d8bd981b Mon Sep 17 00:00:00 2001 From: Adam Fedor Date: Sun, 8 Feb 2004 04:08:00 +0000 Subject: [PATCH] Fix get_symbol_path problems git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18555 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/simple-load.h | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51354acfd..f8c4335cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-02-07 Adam Fedor + + * Source/simple-load.h (__objc_dynamic_get_symbol_path): Remove + ifdefs since dladdr is assured to be present. Set handle to default + if not specified. + 2004-02-04 Fred Kiefer * Source/NSPropertyList.m: (GSBinaryPLParser -objectAtIndex:) diff --git a/Source/simple-load.h b/Source/simple-load.h index b098f1ce3..4be3e4e29 100644 --- a/Source/simple-load.h +++ b/Source/simple-load.h @@ -88,13 +88,15 @@ __objc_dynamic_list_undefined_symbols(void) return NULL; } -static char * +static const char * __objc_dynamic_get_symbol_path(dl_handle_t handle, dl_symbol_t symbol) { -#ifdef HAVE_DLADDR dl_symbol_t sym; Dl_info info; + if (handle == 0) + handle = RTLD_DEFAULT; + sym = dlsym(handle, symbol); if (!sym) @@ -104,9 +106,6 @@ __objc_dynamic_get_symbol_path(dl_handle_t handle, dl_symbol_t symbol) return NULL; return info.dli_fname; -#else - return NULL; -#endif } -#endif /* __sunos_load_h_INCLUDE */ +#endif /* __simple_load_h_INCLUDE */