From f00235c070468f96521cd88ebc8919fa0cb89a25 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sun, 22 Nov 2015 02:43:44 +0000 Subject: import Mesa 11.0.6 --- lib/mesa/src/gallium/auxiliary/util/u_dl.c | 2 +- lib/mesa/src/gallium/auxiliary/util/u_dl.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'lib/mesa/src/gallium/auxiliary/util') diff --git a/lib/mesa/src/gallium/auxiliary/util/u_dl.c b/lib/mesa/src/gallium/auxiliary/util/u_dl.c index 9b97d8dc4..aca435d6c 100644 --- a/lib/mesa/src/gallium/auxiliary/util/u_dl.c +++ b/lib/mesa/src/gallium/auxiliary/util/u_dl.c @@ -45,7 +45,7 @@ struct util_dl_library * util_dl_open(const char *filename) { #if defined(PIPE_OS_UNIX) - return (struct util_dl_library *)dlopen(filename, RTLD_LAZY | RTLD_LOCAL); + return (struct util_dl_library *)dlopen(filename, RTLD_LAZY | RTLD_GLOBAL); #elif defined(PIPE_OS_WINDOWS) return (struct util_dl_library *)LoadLibraryA(filename); #else diff --git a/lib/mesa/src/gallium/auxiliary/util/u_dl.h b/lib/mesa/src/gallium/auxiliary/util/u_dl.h index d2f4737d4..80a00ed67 100644 --- a/lib/mesa/src/gallium/auxiliary/util/u_dl.h +++ b/lib/mesa/src/gallium/auxiliary/util/u_dl.h @@ -32,9 +32,6 @@ #include "pipe/p_config.h" -#ifdef __cplusplus -extern "C" { -#endif #if defined(PIPE_OS_WINDOWS) # define UTIL_DL_EXT ".dll" @@ -82,8 +79,5 @@ util_dl_close(struct util_dl_library *library); const char * util_dl_error(void); -#ifdef __cplusplus -} -#endif #endif /* U_DL_H_ */ -- cgit v1.2.3