redefined TRUE and FALSE to be of type bool

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 716ba55d7f6192a4cd9a0e93637a399d0fbbe37c..91981e3061c0e741e145e75f1b6a10a31f9d0c4d 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -416,13 +416,16 @@ wxObject *wxLibraries::CreateObject(const wxString& path)
     return NULL;
 }
 
     return NULL;
 }
 

-#ifdef __DARWIN__
+#endif // wxUSE_DYNLIB_CLASS && !wxUSE_DYNAMIC_LOADER
+
+#if defined(__DARWIN__) && (wxUSE_DYNLIB_CLASS || wxUSE_DYNAMIC_LOADER)

 // ---------------------------------------------------------------------------
 // For Darwin/Mac OS X
 //   supply the sun style dlopen functions in terms of Darwin NS*
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // For Darwin/Mac OS X
 //   supply the sun style dlopen functions in terms of Darwin NS*
 // ---------------------------------------------------------------------------
 

-#import <mach-o/dyld.h>
+#include <stdio.h>
+#include <mach-o/dyld.h>

 
 static char dl_last_error[1024];
 
 
 static char dl_last_error[1024];
 


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

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

     return 0;
 }
 
     return 0;
 }
 


@@ -494,6 +497,4 @@ void *dlsym(void *handle, const char *symbol)
     return addr;
 }
 
     return addr;
 }
 

-#endif // __DARWIN__
-
-#endif // wxUSE_DYNLIB_CLASS
+#endif // defined(__DARWIN__) && (wxUSE_DYNLIB_CLASS || wxUSE_DYNAMIC_LOADER)