From: Robert Roebling <robert@roebling.de>
Date: Fri, 11 Jan 2002 14:33:03 +0000 (+0000)
Subject: Make log.cpp compilable under CW 5.2 non-Carbon
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5c9226425091564c526b61ea557ecec151d84637

Make log.cpp compilable under CW 5.2 non-Carbon


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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index aef1e7f396..3dfb000b32 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -422,9 +422,9 @@ wxLogStderr::wxLogStderr(FILE *fp)
         m_fp = fp;
 }
 
-#if defined(__WXMAC__) && !defined(__DARWIN__)
+#if defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)
 
-#if !TARGET_API_MAC_CARBON || (__MSL_CPP__ > 0x5300)
+#if !TARGET_API_MAC_CARBON
 // MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
 
 #ifndef __MetroNubUtils__
@@ -608,9 +608,9 @@ OSErr ClearWatchPoint (WatchPointIDT watchPointID)
 	}
 #endif
 
-#endif // !TARGET_API_MAC_CARBON || (__MSL_CPP__ > 0x5300)
+#endif // !TARGET_API_MAC_CARBON
 
-#endif // defined(__WXMAC__) && !defined(__DARWIN__)
+#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)
 
 void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
@@ -636,7 +636,7 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 
     Boolean running = false ;
 
-#if !TARGET_API_MAC_CARBON || (__MSL_CPP__ > 0x5300)
+#if !TARGET_API_MAC_CARBON && (__MWERKS__ > 0x5300)
 
     if ( IsMWDebuggerRunning() && AmIBeingMWDebugged() )
     {