Fix for incomplete setup (wxPalmOS case).

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

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

+#if defined(__DARWIN__)
+    #include <dlfcn.h>
+#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)


@@ -226,7 +230,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


@@ -321,7 +325,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