compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-02-23 22:43:48 +00:00 · 1999-02-23 22:43:48 +00:00 · 90022ddc1e
commit 90022ddc1e
parent 3aa0e8fa2b
1 changed files with 8 additions and 1 deletions
--- 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 <windows.h>
+
+    // 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