diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2010-01-12 11:25:02 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2010-01-12 11:25:02 +0800 |
| commit | 562c127693200822f04a145db50add1be2425d7b (patch) | |
| tree | 9441774fb212b17ddf2a364f06abc43f166cc00b /src/mesa/main/dlopen.c | |
| parent | e5d351dcfde58777162552cf5cd2a9cd8299f4cd (diff) | |
| parent | 077d6dd7508af88509dd0499c5dfbdaa186b4015 (diff) | |
Merge branch 'master' into opengl-es-v2
Conflicts:
src/mesa/main/dd.h
Diffstat (limited to 'src/mesa/main/dlopen.c')
| -rw-r--r-- | src/mesa/main/dlopen.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/mesa/main/dlopen.c b/src/mesa/main/dlopen.c index 414cfad8e2..81e032081d 100644 --- a/src/mesa/main/dlopen.c +++ b/src/mesa/main/dlopen.c @@ -31,7 +31,7 @@ #include "compiler.h" #include "dlopen.h" -#if defined(_GNU_SOURCE) && !defined(__MINGW32__) +#if defined(_GNU_SOURCE) && !defined(__MINGW32__) && !defined(__blrts) #include <dlfcn.h> #endif #if defined(_WIN32) @@ -46,7 +46,9 @@ void * _mesa_dlopen(const char *libname, int flags) { -#if defined(_GNU_SOURCE) +#if defined(__blrts) + return NULL; +#elif defined(_GNU_SOURCE) flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */ return dlopen(libname, flags); #elif defined(__MINGW32__) @@ -65,7 +67,9 @@ _mesa_dlopen(const char *libname, int flags) GenericFunc _mesa_dlsym(void *handle, const char *fname) { -#if defined(__DJGPP__) +#if defined(__blrts) + return (GenericFunc) NULL; +#elif defined(__DJGPP__) /* need '_' prefix on symbol names */ char fname2[1000]; fname2[0] = '_'; @@ -88,7 +92,9 @@ _mesa_dlsym(void *handle, const char *fname) void _mesa_dlclose(void *handle) { -#if defined(_GNU_SOURCE) +#if defined(__blrts) + (void) handle; +#elif defined(_GNU_SOURCE) dlclose(handle); #elif defined(__MINGW32__) FreeLibrary(handle); |