Commit af7a3493 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

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"
parent a1fe2366
...@@ -1365,8 +1365,10 @@ do { doubleget_union _tmp; \ ...@@ -1365,8 +1365,10 @@ do { doubleget_union _tmp; \
#define dlsym(lib, name) (void*)GetProcAddress((HMODULE)lib, name) #define dlsym(lib, name) (void*)GetProcAddress((HMODULE)lib, name)
#define dlopen(libname, unused) LoadLibraryEx(libname, NULL, 0) #define dlopen(libname, unused) LoadLibraryEx(libname, NULL, 0)
#define dlclose(lib) FreeLibrary((HMODULE)lib) #define dlclose(lib) FreeLibrary((HMODULE)lib)
#ifndef HAVE_DLOPEN
#define HAVE_DLOPEN #define HAVE_DLOPEN
#endif #endif
#endif
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
#if defined(HAVE_DLFCN_H) #if defined(HAVE_DLFCN_H)
...@@ -1375,6 +1377,9 @@ do { doubleget_union _tmp; \ ...@@ -1375,6 +1377,9 @@ do { doubleget_union _tmp; \
#endif #endif
#ifndef HAVE_DLERROR #ifndef HAVE_DLERROR
#ifdef _WIN32
#define dlerror() ""
#else
#define dlerror() "No support for dynamic loading (static build?)" #define dlerror() "No support for dynamic loading (static build?)"
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment