From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Sun, 15 Jul 2001 21:07:34 +0000 (+0000)
Subject: modified configure to allow configuration of wxMotif under Darwin/Mac OS X
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0cbb929795f8f37acd1eef923a3d8f48f978d963?hp=6e040042bae080a3fe8907e3772c103deab91c13

modified configure to allow configuration of wxMotif under Darwin/Mac OS X
wxWindows can be configured as wxMac or wxMotif under Mac OS X
replaced __WXMAC_X__ define by __DARWIN__ (general Darwin related issues)
moved dlopen/dlerror code to dynlib.cpp to make it available for wxMotif
----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/log.cpp b/src/common/log.cpp
index c16ad865b4..d20aa9b6dd 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -418,7 +418,7 @@ wxLogStderr::wxLogStderr(FILE *fp)
         m_fp = fp;
 }
 
-#if defined(__WXMAC__) && !defined(__UNIX__)
+#if defined(__WXMAC__) && !defined(__DARWIN__)
 #define kDebuggerSignature        'MWDB'
 
 static Boolean FindProcessBySignature(OSType signature, ProcessInfoRec* info)
@@ -514,7 +514,7 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     str += wxT("\r\n") ;
     OutputDebugString(str.c_str());
 #endif // MSW
-#if defined(__WXMAC__) && !defined(__WXMAC_X__) && wxUSE_GUI
+#if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI
     Str255 pstr ;
     strcpy( (char*) pstr , str.c_str() ) ;
     strcat( (char*) pstr , ";g" ) ;
diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index d3d0d06484..93e0ab3266 100644
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -42,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif
-#if defined(__UNIX__) && !defined(__WXMAC_X__)
+#if defined(__UNIX__) && !defined(__WXMAC__)
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
@@ -201,7 +201,7 @@ unsigned short wxIPV6address::Service()
 
 #endif
 
-#if defined(__UNIX__) && !defined(__WXMAC_X__)
+#if defined(__UNIX__) && !defined(__WXMAC__)
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 // ---------------------------------------------------------------------------