mimetype.cpp/.h split into unix,mac,msw

[wxWidgets.git] / src / common / dynlib.cpp

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 5086123d9348f2bc78e95fb32d365ed86aa00b3b..1ab0a358f8819d00a497d80fa2e781841a116af2 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -22,6 +22,9 @@
 #endif
 
 #include  "wx/wxprec.h"
 #endif
 
 #include  "wx/wxprec.h"

+#if defined(__WINDOWS__)
+#include "wx/msw/private.h"
+#endif

 
 #ifdef __BORLANDC__
   #pragma hdrstop
 
 #ifdef __BORLANDC__
   #pragma hdrstop


@@ -45,7 +48,6 @@
 #elif defined(HAVE_SHL_LOAD)
 #   define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)
 #   define wxDllClose      shl_unload
 #elif defined(HAVE_SHL_LOAD)
 #   define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)
 #   define wxDllClose      shl_unload

-

     static inline void *wxDllGetSymbol(shl_t handle, const wxString& name)
     {
         void *sym;
     static inline void *wxDllGetSymbol(shl_t handle, const wxString& name)
     {
         void *sym;


@@ -55,8 +57,6 @@
             return (void *)0;
     }
 #elif defined(__WINDOWS__)
             return (void *)0;
     }
 #elif defined(__WINDOWS__)

-#   include <windows.h>
-

     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__
 #      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)
     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__
 #      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)