Compile fixes.

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 447fb80a87e7026eded1bc30861bd8ae218a354f..b4a60768fb10eb2357b00c048ecfbae07d6bf25b 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -40,23 +40,30 @@
 // ----------------------------------------------------------------------------
 
 #if defined(HAVE_DLOPEN)
 // ----------------------------------------------------------------------------
 
 #if defined(HAVE_DLOPEN)

-    #define wxDllOpen(lib)                dlopen(lib, RTLD_LAZY)
-    #define wxDllGetSymbol(handle, name)  dlsym(handle, (char *)name)
+    #define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_LAZY)
+    #define wxDllGetSymbol(handle, name)  dlsym(handle, name.mb_str())

     #define wxDllClose                    dlclose
 #elif defined(HAVE_SHL_LOAD)
     #define wxDllClose                    dlclose
 #elif defined(HAVE_SHL_LOAD)

-    #define wxDllOpen(lib)                shl_load(lib, BIND_DEFERRED, 0)
+    #define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)

     #define wxDllClose      shl_unload
 
     #define wxDllClose      shl_unload
 

-    static inline void *wxDllGetSymbol(shl_t handle, const char *name)
+    static inline void *wxDllGetSymbol(shl_t handle, const wxString& name)

     {
         void *sym;
     {
         void *sym;

-        if ( shl_findsym(&handle, name, TYPE_UNDEFINED, &sym) == 0 )
+        if ( shl_findsym(&handle, name.mb_str(), TYPE_UNDEFINED, &sym) == 0 )

             return sym;
         else
             return (void *)0;
     }
 #elif defined(__WINDOWS__)
             return sym;
         else
             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
     #define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
     #define wxDllClose                      ::FreeLibrary
 #else


@@ -172,9 +179,7 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
         symbol = (void *)symAddress ; 
     }
 #else
         symbol = (void *)symAddress ; 
     }
 #else

-    // VZ: hmm... why is WXSTRINGCAST needed? if it's really modified, we
-    //     should make a copy of it
-    symbol = wxDllGetSymbol(m_handle, WXSTRINGCAST symbname);
+    symbol = wxDllGetSymbol(m_handle, symbname);

 #endif
 
     if ( !symbol )
 #endif
 
     if ( !symbol )


@@ -227,7 +232,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )
         libPath << ':' << envLibPath;
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )
         libPath << ':' << envLibPath;

-    wxStringTokenizer tokenizer(libPath, ':');
+    wxStringTokenizer tokenizer(libPath, _T(':'));

     while ( tokenizer.HasMoreToken() )
     {
         wxString fullname(tokenizer.NextToken());
     while ( tokenizer.HasMoreToken() )
     {
         wxString fullname(tokenizer.NextToken());