diff options
| author | Adam Jackson <ajax@redhat.com> | 2014-06-16 11:55:30 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2014-09-26 15:27:18 -0400 |
| commit | 7cd192edc195c089c6df32e9f22e57da7467b6fd (patch) | |
| tree | 5c9ec8319b8d736c29f133a0dfc1b0bcdbba1d27 /hw | |
| parent | cc59be38b7eff52a1d003b390f2994c73ee0b3e9 (diff) | |
loader: Deobfuscate RTLD_* macro stuff
POSIX requires that these be named correctly, no need to be clever.
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/loader/loader.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index cc41dcb4c..31329846a 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -71,24 +71,6 @@ #include <dlfcn.h> #include <X11/Xos.h> -#if defined(DL_LAZY) -#define DLOPEN_LAZY DL_LAZY -#elif defined(RTLD_LAZY) -#define DLOPEN_LAZY RTLD_LAZY -#elif defined(__FreeBSD__) -#define DLOPEN_LAZY 1 -#else -#define DLOPEN_LAZY 0 -#endif - -#if defined(LD_GLOBAL) -#define DLOPEN_GLOBAL LD_GLOBAL -#elif defined(RTLD_GLOBAL) -#define DLOPEN_GLOBAL RTLD_GLOBAL -#else -#define DLOPEN_GLOBAL 0 -#endif - #else #error i have no dynamic linker and i must scream #endif @@ -128,7 +110,7 @@ LoaderOpen(const char *module, int *errmaj, int *errmin) xf86Msg(X_INFO, "Loading %s\n", module); - if (!(ret = dlopen(module, DLOPEN_LAZY | DLOPEN_GLOBAL))) { + if (!(ret = dlopen(module, RTLD_LAZY | RTLD_GLOBAL))) { xf86Msg(X_ERROR, "Failed to load %s: %s\n", module, dlerror()); if (errmaj) *errmaj = LDR_NOLOAD; @@ -151,7 +133,7 @@ LoaderSymbol(const char *name) return p; if (!global_scope) - global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL); + global_scope = dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL); if (global_scope) return dlsym(global_scope, name); |