Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(blind) compilation fixes for OS X 10.2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-01-29 21:19:52 +00:00
parent 5ac52b5da0
commit bc5f4d9899
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/unix/dlunix.cpp
View File

@@ -33,10 +33,26 @@
#include "wx/log.h" #include "wx/log.h"
#endif #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 <dlfcn.h> #include <dlfcn.h>
#endif #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__) #if defined(HAVE_DLOPEN) || defined(__DARWIN__)
#define USE_POSIX_DL_FUNCS #define USE_POSIX_DL_FUNCS
#elif !defined(HAVE_SHL_LOAD) #elif !defined(HAVE_SHL_LOAD)
@@ -181,24 +197,18 @@ wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
#ifdef USE_POSIX_DL_FUNCS #ifdef USE_POSIX_DL_FUNCS
int rtldFlags = 0; int rtldFlags = 0;
#ifdef RTLD_LAZY
if ( flags & wxDL_LAZY ) if ( flags & wxDL_LAZY )
{ {
rtldFlags |= RTLD_LAZY; rtldFlags |= RTLD_LAZY;
} }
#endif
#ifdef RTLD_NOW
if ( flags & wxDL_NOW ) if ( flags & wxDL_NOW )
{ {
rtldFlags |= RTLD_NOW; rtldFlags |= RTLD_NOW;
} }
#endif
#ifdef RTLD_GLOBAL
if ( flags & wxDL_GLOBAL ) if ( flags & wxDL_GLOBAL )
{ {
rtldFlags |= RTLD_GLOBAL; rtldFlags |= RTLD_GLOBAL;
} }
#endif
return dlopen(libname.fn_str(), rtldFlags); return dlopen(libname.fn_str(), rtldFlags);
#else // !USE_POSIX_DL_FUNCS #else // !USE_POSIX_DL_FUNCS