WinCE adaptations

[wxWidgets.git] / src / unix / dlunix.cpp

diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp
index fcad9a56713502ee2f1d59e3ce319271d3d65702..dbf286a7d9576964b44bf11b60e6e2969548d94f 100644 (file)
--- a/src/unix/dlunix.cpp
+++ b/src/unix/dlunix.cpp
@@ -33,10 +33,26 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-#if defined(__DARWIN__)
+// only Mac OS X 10.3+ has dlfcn.h, and it is simpler to always provide our own
+// wrappers using the native functions instead of doing checks for OS version
+#ifndef __DARWIN__

     #include <dlfcn.h>
 #endif
 
     #include <dlfcn.h>
 #endif
 

+// if some flags are not supported, just ignore them
+#ifndef RTLD_LAZY
+    #define RTLD_LAZY 0
+#endif
+
+#ifndef RTLD_NOW
+    #define RTLD_NOW 0
+#endif
+
+#ifndef RTLD_GLOBAL
+    #define RTLD_GLOBAL 0
+#endif
+
+

 #if defined(HAVE_DLOPEN) || defined(__DARWIN__)
     #define USE_POSIX_DL_FUNCS
 #elif !defined(HAVE_SHL_LOAD)
 #if defined(HAVE_DLOPEN) || defined(__DARWIN__)
     #define USE_POSIX_DL_FUNCS
 #elif !defined(HAVE_SHL_LOAD)


@@ -139,7 +155,7 @@ void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)
 
 int dlclose(void *handle)
 {
 
 int dlclose(void *handle)
 {

-    NSUnLinkModule( handle, NSUNLINKMODULE_OPTION_NONE);
+    NSUnLinkModule((NSModule)handle, NSUNLINKMODULE_OPTION_NONE);

     return 0;
 }
 
     return 0;
 }
 


@@ -153,7 +169,7 @@ void *dlsym(void *handle, const char *symbol)
     p[0] = '_';
     strcpy(p + 1, symbol);
 
     p[0] = '_';
     strcpy(p + 1, symbol);
 

-    NSSymbol nsSymbol = NSLookupSymbolInModule( handle, p );
+    NSSymbol nsSymbol = NSLookupSymbolInModule((NSModule)handle, p );

     return nsSymbol ? NSAddressOfSymbol(nsSymbol) : NULL;
 }
 
     return nsSymbol ? NSAddressOfSymbol(nsSymbol) : NULL;
 }
 


@@ -175,30 +191,17 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
 /* static */
 wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
 {
 /* static */
 wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
 {

-    wxASSERT_MSG( (flags & wxDL_NOW) == 0,
+    wxASSERT_MSG( !(flags & wxDL_NOW) || !(flags & wxDL_LAZY),

                   _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
 
 #ifdef USE_POSIX_DL_FUNCS
                   _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
 
 #ifdef USE_POSIX_DL_FUNCS

-    int rtldFlags = 0;
+    // we need to use either RTLD_NOW or RTLD_LAZY because if we call dlopen()
+    // with flags == 0 recent versions of glibc just fail the call, so use
+    // RTLD_NOW even if wxDL_NOW was not specified
+    int rtldFlags = flags & wxDL_LAZY ? RTLD_LAZY : RTLD_NOW;

 
 

-#ifdef RTLD_LAZY
-    if ( flags & wxDL_LAZY )
-    {
-        rtldFlags |= RTLD_LAZY;
-    }
-#endif
-#ifdef RTLD_NOW
-    if ( flags & wxDL_NOW )
-    {
-        rtldFlags |= RTLD_NOW;
-    }
-#endif
-#ifdef RTLD_GLOBAL

     if ( flags & wxDL_GLOBAL )
     if ( flags & wxDL_GLOBAL )

-    {

         rtldFlags |= RTLD_GLOBAL;
         rtldFlags |= RTLD_GLOBAL;

-    }
-#endif

 
     return dlopen(libname.fn_str(), rtldFlags);
 #else // !USE_POSIX_DL_FUNCS
 
     return dlopen(libname.fn_str(), rtldFlags);
 #else // !USE_POSIX_DL_FUNCS


@@ -325,13 +328,13 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
 
 #ifdef __LINUX__
     // examine /proc/self/maps to find out what is loaded in our address space
 
 #ifdef __LINUX__
     // examine /proc/self/maps to find out what is loaded in our address space

-    wxFFile file("/proc/self/maps");
+    wxFFile file(_T("/proc/self/maps"));

     if ( file.IsOpened() )
     {
         // details of the module currently being parsed
         wxString pathCur;
     if ( file.IsOpened() )
     {
         // details of the module currently being parsed
         wxString pathCur;

-        unsigned long startCur,
-                      endCur;
+        unsigned long startCur = 0,
+                      endCur = 0;

 
         char path[1024];
         char buf[1024];
 
         char path[1024];
         char buf[1024];