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

Found the RIGHT place to make the __unix__ fix.

Browse Source 
Undoing the other changes I just made.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-09-30 23:48:21 +00:00
parent d4b67f95d2
commit 9e4b2f1c57
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/dynlib.cpp
View File

@@ -31,7 +31,7 @@
// System dependent include // System dependent include
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#if defined(__UNIX__) || defined(__unix__) #if defined(__UNIX__)
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
@@ -71,7 +71,7 @@ wxLibrary::wxLibrary(void *handle)
wxLibrary::~wxLibrary() wxLibrary::~wxLibrary()
{ {
if (m_handle && m_destroy) { if (m_handle && m_destroy) {
#if defined(__UNIX__) || defined(__unix__) #if defined(__UNIX__)
dlclose(m_handle); dlclose(m_handle);
#endif #endif
#ifdef __WINDOWS__ #ifdef __WINDOWS__
@@ -115,7 +115,7 @@ void wxLibrary::PrepareClasses(wxClassInfo *first)
void *wxLibrary::GetSymbol(const wxString& symbname) void *wxLibrary::GetSymbol(const wxString& symbname)
{ {
#if defined(__UNIX__) || defined(__unix__) #if defined(__UNIX__)
return dlsym(m_handle, WXSTRINGCAST symbname); return dlsym(m_handle, WXSTRINGCAST symbname);
#endif #endif
#ifdef __WINDOWS__ #ifdef __WINDOWS__
@@ -158,7 +158,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
old_sm_first = wxClassInfo::sm_first; old_sm_first = wxClassInfo::sm_first;
wxClassInfo::sm_first = NULL; wxClassInfo::sm_first = NULL;
#if defined(__UNIX__) || defined(__unix__) #if defined(__UNIX__)
lib_name.Prepend("./lib"); lib_name.Prepend("./lib");
lib_name += ".so"; lib_name += ".so";