GTK 1.2 compilo/link error.

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

diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp
index 8a9de2c42197344092b6f5256a2c18ab7ae6af02..e812f56a9cb0eceeb38822c7f040769f35883dc6 100644 (file)
--- a/src/unix/dlunix.cpp
+++ b/src/unix/dlunix.cpp
@@ -28,6 +28,31 @@
 #include "wx/dynlib.h"
 #include "wx/ffile.h"
 
 #include "wx/dynlib.h"
 #include "wx/ffile.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+// 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
+
+// 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)


@@ -130,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;
 }
 


@@ -144,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;
 }
 


@@ -172,24 +197,18 @@ wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
 #ifdef USE_POSIX_DL_FUNCS
     int rtldFlags = 0;
 
 #ifdef USE_POSIX_DL_FUNCS
     int rtldFlags = 0;
 

-#ifdef RTLD_LAZY

     if ( flags & wxDL_LAZY )
     {
         rtldFlags |= RTLD_LAZY;
     }
     if ( flags & wxDL_LAZY )
     {
         rtldFlags |= RTLD_LAZY;
     }

-#endif
-#ifdef RTLD_NOW

     if ( flags & wxDL_NOW )
     {
         rtldFlags |= RTLD_NOW;
     }
     if ( flags & wxDL_NOW )
     {
         rtldFlags |= RTLD_NOW;
     }

-#endif
-#ifdef RTLD_GLOBAL

     if ( flags & wxDL_GLOBAL )
     {
         rtldFlags |= RTLD_GLOBAL;
     }
     if ( flags & wxDL_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


@@ -221,7 +240,7 @@ void wxDynamicLibrary::Unload(wxDllType handle)
     shl_unload(handle);
 #endif // USE_POSIX_DL_FUNCS/!USE_POSIX_DL_FUNCS
 
     shl_unload(handle);
 #endif // USE_POSIX_DL_FUNCS/!USE_POSIX_DL_FUNCS
 

-#ifdef USE_POSIX_DL_FUNCS
+#if defined(USE_POSIX_DL_FUNCS) && defined(wxHAVE_DYNLIB_ERROR)

     if ( rc != 0 )
         Error();
 #endif
     if ( rc != 0 )
         Error();
 #endif


@@ -316,7 +335,7 @@ 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
     if ( file.IsOpened() )
     {
         // details of the module currently being parsed