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

Make log.cpp compilable under CW 5.2 non-Carbon

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-01-11 14:33:03 +00:00
parent 66a09d4776
commit 5c92264250
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/log.cpp
View File

@@ -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... // MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
#ifndef __MetroNubUtils__ #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() )
{ {