From: Robin Dunn Date: Wed, 30 Sep 1998 23:13:29 +0000 (+0000) Subject: fixed some ifdef's to also check for __unix__ X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/297a3fece1b9e5a55ba24941462c99d549403719 fixed some ifdef's to also check for __unix__ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 6fcdf2cd63..02d2cdb35f 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -31,7 +31,7 @@ // System dependent include // --------------------------------------------------------------------------- -#ifdef __UNIX__ +#if defined(__UNIX__) || defined(__unix__) #include #endif @@ -71,7 +71,7 @@ wxLibrary::wxLibrary(void *handle) wxLibrary::~wxLibrary() { if (m_handle && m_destroy) { -#ifdef __UNIX__ +#if defined(__UNIX__) || defined(__unix__) dlclose(m_handle); #endif #ifdef __WINDOWS__ @@ -115,7 +115,7 @@ void wxLibrary::PrepareClasses(wxClassInfo *first) void *wxLibrary::GetSymbol(const wxString& symbname) { -#ifdef __UNIX__ +#if defined(__UNIX__) || defined(__unix__) return dlsym(m_handle, WXSTRINGCAST symbname); #endif #ifdef __WINDOWS__ @@ -158,7 +158,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name) old_sm_first = wxClassInfo::sm_first; wxClassInfo::sm_first = NULL; -#if defined(__UNIX__) +#if defined(__UNIX__) || defined(__unix__) lib_name.Prepend("./lib"); lib_name += ".so"; @@ -199,7 +199,7 @@ wxObject *wxLibraries::CreateObject(const wxString& path) while (node) { obj = ((wxLibrary *)node->Data())->CreateObject(path); - if (obj) + if (obj) return obj; node = node->Next();