diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 447fb80a87..cf218301c2 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -56,7 +56,14 @@ return (void *)0; } #elif defined(__WINDOWS__) - #define wxDllOpen(lib) ::LoadLibrary(lib) + #include + + // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary + #ifdef __WIN32__ + #define wxDllOpen(lib) ::LoadLibraryEx(lib, 0, 0) + #else // Win16 + #define wxDllOpen(lib) ::LoadLibrary(lib) + #endif // Win32/16 #define wxDllGetSymbol(handle, name) ::GetProcAddress(handle, name) #define wxDllClose ::FreeLibrary #else