From bc5f4d9899845a91b2c5e8513b32b6b23125f22c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 29 Jan 2005 21:19:52 +0000 Subject: [PATCH] (blind) compilation fixes for OS X 10.2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/dlunix.cpp | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp index b8d5c1ff93..21b00d22a8 100644 --- a/src/unix/dlunix.cpp +++ b/src/unix/dlunix.cpp @@ -33,10 +33,26 @@ #include "wx/log.h" #endif -#if defined(__DARWIN__) +// 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 #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 +#endif + + #if defined(HAVE_DLOPEN) || defined(__DARWIN__) #define USE_POSIX_DL_FUNCS #elif !defined(HAVE_SHL_LOAD) @@ -181,24 +197,18 @@ wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags) #ifdef USE_POSIX_DL_FUNCS int rtldFlags = 0; -#ifdef RTLD_LAZY if ( flags & wxDL_LAZY ) { rtldFlags |= RTLD_LAZY; } -#endif -#ifdef RTLD_NOW if ( flags & wxDL_NOW ) { rtldFlags |= RTLD_NOW; } -#endif -#ifdef RTLD_GLOBAL if ( flags & wxDL_GLOBAL ) { rtldFlags |= RTLD_GLOBAL; } -#endif return dlopen(libname.fn_str(), rtldFlags); #else // !USE_POSIX_DL_FUNCS -- 2.45.2