diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 13:00:33 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 13:00:33 +0100 |
| commit | 745c53ec06794c4faaf0c9c3f9a1bf4ffc3f0759 (patch) | |
| tree | 560abf8d5af4977dcacbce07a9502cb84d6bb003 /include/my_global.h | |
| parent | 63d32c115dd962b53cf7bcaa340472ee2f44f9e2 (diff) | |
| parent | 6404504d0c10d58ad5861bdb72edd54508f1364c (diff) | |
| download | mariadb-git-745c53ec06794c4faaf0c9c3f9a1bf4ffc3f0759.tar.gz | |
5.2->5.3 merge
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 475ae4b27e4..2fc6e413398 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1555,18 +1555,20 @@ do { doubleget_union _tmp; \ #define NO_EMBEDDED_ACCESS_CHECKS #endif -#ifdef HAVE_DLOPEN -#if defined(__WIN__) +#if defined(_WIN32) #define dlsym(lib, name) GetProcAddress((HMODULE)lib, name) #define dlopen(libname, unused) LoadLibraryEx(libname, NULL, 0) #define dlclose(lib) FreeLibrary((HMODULE)lib) -#elif defined(HAVE_DLFCN_H) +#define HAVE_DLOPEN +#endif + +#ifdef HAVE_DLFCN_H #include <dlfcn.h> #endif + #ifndef HAVE_DLERROR #define dlerror() "" #endif -#endif /* FreeBSD 2.2.2 does not define RTLD_NOW) */ #ifndef RTLD_NOW |