diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-10-04 22:11:18 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-10-04 22:11:18 +0200 |
| commit | af7a3493156cf16edf1a0e500133ffb87f300b67 (patch) | |
| tree | cc003af852aba96a3fe0038b4d20513e68e3412d /include/my_global.h | |
| parent | a1fe23668fd2dd0c2dd9b8b14df88e216bfc4e0b (diff) | |
| download | mariadb-git-af7a3493156cf16edf1a0e500133ffb87f300b67.tar.gz | |
More fixes after WL1054 push:
- fix ~20 warnings about redefinition of HAVE_DLOPEN
This was caused by new ADD_DEFINITIONS(-DHAVE_DLOPEN) inside client library CMakeLists.txt
- fix dlerror() message which ("static build?" ) which is only confusing on Windows,
there is no "static build"
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index ce32ac07372..5f7043c54cb 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1365,8 +1365,10 @@ do { doubleget_union _tmp; \ #define dlsym(lib, name) (void*)GetProcAddress((HMODULE)lib, name) #define dlopen(libname, unused) LoadLibraryEx(libname, NULL, 0) #define dlclose(lib) FreeLibrary((HMODULE)lib) +#ifndef HAVE_DLOPEN #define HAVE_DLOPEN #endif +#endif #ifdef HAVE_DLOPEN #if defined(HAVE_DLFCN_H) @@ -1375,6 +1377,9 @@ do { doubleget_union _tmp; \ #endif #ifndef HAVE_DLERROR +#ifdef _WIN32 +#define dlerror() "" +#else #define dlerror() "No support for dynamic loading (static build?)" #endif |