X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..19c35fa587f97cf83e2cb28afe76b8db85b36c9f:/src/common/dynlib.cpp

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index fb869777e9..185e81661f 100644
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -336,7 +336,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     strcpy( (char *)symName, name );
     c2pstr( (char *)symName );
 #endif
-    if( FindSymbol( dllHandle, symName, &symAddress, &symClass ) == noErr )
+    if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
         symbol = (void *)symAddress;
 
 #elif defined(__WXPM__) || defined(__EMX__)
@@ -466,6 +466,19 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
 #undef wxDLLVER
 #undef WXSTRINGIZE
 
+#ifdef __WINDOWS__
+    // Add compiler identification:
+    #if defined(__GNUG__)
+        suffix << _T("_gcc");
+    #elif defined(__VISUALC__)
+        suffix << _T("_vc");
+    #elif defined(__WATCOMC__)
+        suffix << _T("_wat");
+    #elif defined(__BORLANDC__)
+        suffix << _T("_bcc");
+    #endif
+#endif
+
     return CanonicalizeName(name + suffix, wxDL_MODULE);
 }