From 83135a2c2881fbce222c42c31a60bfe815fdf1b3 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 18 Feb 2008 22:53:38 +0000 Subject: [PATCH] Don't include dlfcn.h from wx/dynlib.h on Darwin. We might be using our own internal replacement functions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dynlib.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h index 0fabb058bf..a6a45f74c1 100644 --- a/include/wx/dynlib.h +++ b/include/wx/dynlib.h @@ -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 typedef void *wxDllType; #elif defined(HAVE_SHL_LOAD) #include typedef shl_t wxDllType; -#elif defined(__DARWIN__) - typedef void *wxDllType; #elif defined(__WXMAC__) #include typedef CFragConnectionID wxDllType; -- 2.50.0