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 aef1e7f396d234c7bf408eaa18400c3b783fe786..3dfb000b32b58a3ba58af98edea09a7056733798 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -422,9 +422,9 @@ wxLogStderr::wxLogStderr(FILE *fp)
         m_fp = 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__
 // 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
 

-#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))
 {
 
 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 ;
 
 
     Boolean running = false ;
 

-#if !TARGET_API_MAC_CARBON || (__MSL_CPP__ > 0x5300)
+#if !TARGET_API_MAC_CARBON && (__MWERKS__ > 0x5300)

 
     if ( IsMWDebuggerRunning() && AmIBeingMWDebugged() )
     {
 
     if ( IsMWDebuggerRunning() && AmIBeingMWDebugged() )
     {