From 3e4efd7cb97cb2b3d33f34d3516b6f2efdaa3bfa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 22 Feb 1999 20:34:06 +0000 Subject: [PATCH] dlopen fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dynlib.h | 9 +++++++++ src/common/dynlib.cpp | 13 ------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h index 745cdddcd0..0419db3579 100644 --- a/include/wx/dynlib.h +++ b/include/wx/dynlib.h @@ -20,6 +20,15 @@ #include #include +// TODO should be done by configure +#if defined(__UNIX__) && !(defined(HAVE_DLOPEN) || defined(HAVE_SHLLOAD)) + #if defined(__LINUX__) || defined(__SOLARIS__) || defined(__SUNOS__) || defined(__FREEBSD__) + #define HAVE_DLOPEN + #elif defined(__HPUX__) + #define HAVE_SHLLOAD + #endif // Unix flavour +#endif // !Unix or already have some HAVE_xxx defined + #if defined(HAVE_DLOPEN) #include diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 57820da629..ead9a1baef 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -27,19 +27,6 @@ #pragma hdrstop #endif //__BORLANDC__ -// TODO should be done by configure -#if defined(__UNIX__) && !(defined(HAVE_DLOPEN) || defined(HAVE_SHLLOAD)) - #if defined(__LINUX__) || defined(__SOLARIS__) || defined(__SUNOS__) || defined(__FREEBSD__) - #ifndef HAVE_DLOPEN - #define HAVE_DLOPEN - #endif - #elif defined(__HPUX__) - #ifndef HAVE_SHLLOAD - #define HAVE_SHLLOAD - #endif - #endif // Unix flavour -#endif // !Unix or already have some HAVE_xxx defined - #include "wx/dynlib.h" #include "wx/filefn.h" #include "wx/intl.h" -- 2.45.2