]> git.saurik.com Git - wxWidgets.git/commitdiff
Don't include dlfcn.h from wx/dynlib.h on Darwin. We might be using our own
authorDavid Elliott <dfe@tgwbd.org>
Mon, 18 Feb 2008 22:53:38 +0000 (22:53 +0000)
committerDavid Elliott <dfe@tgwbd.org>
Mon, 18 Feb 2008 22:53:38 +0000 (22:53 +0000)
internal replacement functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/dynlib.h

index 0fabb058bf43a96a198697d8c9d710eb983b6570..a6a45f74c11acfef531fd96b2fd376772c53d5af 100644 (file)
@@ -42,14 +42,15 @@ class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator;
 // native version, even if configure detected presence of DLOPEN.
 #if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__)
     typedef HMODULE             wxDllType;
+#elif defined(__DARWIN__)
+    // Don't include dlfcn.h on Darwin, we may be using our own replacements.
+    typedef void               *wxDllType;
 #elif defined(HAVE_DLOPEN)
     #include <dlfcn.h>
     typedef void               *wxDllType;
 #elif defined(HAVE_SHL_LOAD)
     #include <dl.h>
     typedef shl_t               wxDllType;
-#elif defined(__DARWIN__)
-    typedef void               *wxDllType;
 #elif defined(__WXMAC__)
     #include <CodeFragments.h>
     typedef CFragConnectionID   wxDllType;