corrected SF bug #809314: wxDynamicLibrary::ms_dllext definition for wxMac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 167249ab207f4ad84ca714a5590bce1736f3b068..f8d9e8db9b80462002283f96912809b54e241396 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -153,9 +153,13 @@ void *dlsym(void *handle, const char *symbol)
 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
     const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
     const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");

+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    const wxChar *wxDynamicLibrary::ms_dllext = _T("");

 #elif defined(__UNIX__)
     #if defined(__HPUX__)
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
 #elif defined(__UNIX__)
     #if defined(__HPUX__)
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");

+    #elif defined(__DARWIN__)
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".dylib");

     #else
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
     #endif
     #else
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
     #endif


@@ -405,7 +409,7 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name,
 {
     wxString nameCanonic;
 
 {
     wxString nameCanonic;
 

-    // under Unix the library names usualyl start with "lib" prefix, add it
+    // under Unix the library names usually start with "lib" prefix, add it

 #ifdef __UNIX__
     switch ( cat )
     {
 #ifdef __UNIX__
     switch ( cat )
     {