Fix compilation with MinGW -std=c++11 option.

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index d8ab264fb4a03c057259d18bebc5a110ec0755bf..0ebec2bd9c417e6364838ff8cfae5334f3ace25f 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -59,7 +59,7 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
 #endif
 
 // for MSW/Unix it is defined in platform-specific file
 #endif
 
 // for MSW/Unix it is defined in platform-specific file

-#if !(defined(__WXMSW__) || defined(__UNIX__)) || defined(__EMX__)
+#if !(defined(__WINDOWS__) || defined(__UNIX__)) || defined(__EMX__)

 
 wxDllType wxDynamicLibrary::GetProgramHandle()
 {
 
 wxDllType wxDynamicLibrary::GetProgramHandle()
 {


@@ -67,7 +67,7 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
    return 0;
 }
 
    return 0;
 }
 

-#endif // __WXMSW__ || __UNIX__
+#endif // __WINDOWS__ || __UNIX__

 
 
 bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 
 
 bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)


@@ -112,7 +112,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 // for MSW and Unix this is implemented in the platform-specific file
 //
 // TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp!
 // for MSW and Unix this is implemented in the platform-specific file
 //
 // TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp!

-#if (!defined(__WXMSW__) && !defined(__UNIX__)) || defined(__EMX__)
+#if (!defined(__WINDOWS__) && !defined(__UNIX__)) || defined(__EMX__)

 
 /* static */
 void wxDynamicLibrary::Unload(wxDllType handle)
 
 /* static */
 void wxDynamicLibrary::Unload(wxDllType handle)


@@ -124,7 +124,7 @@ void wxDynamicLibrary::Unload(wxDllType handle)
 #endif
 }
 
 #endif
 }
 

-#endif // !(__WXMSW__ || __UNIX__)
+#endif // !(__WINDOWS__ || __UNIX__)

 
 void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
 {
 
 void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
 {