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

oops... conflict removed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-04-21 01:49:11 +00:00
parent 807a903e68
commit 9c21efe301
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/log.cpp
View File

@@ -112,23 +112,9 @@ static inline bool IsLoggingEnabled()
// generic log function // generic log function
void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...) void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
{ {
<<<<<<< log.cpp
if ( wxLog::GetActiveTarget() != NULL ) {
wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
va_list argptr;
va_start(argptr, szFormat);
wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
va_end(argptr);
=======
if ( IsLoggingEnabled() ) { if ( IsLoggingEnabled() ) {
wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
>>>>>>> 1.93.2.3
<<<<<<< log.cpp
wxLog::OnLog(level, s_szBuf, time(NULL));
}
=======
va_list argptr; va_list argptr;
va_start(argptr, szFormat); va_start(argptr, szFormat);
wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr); wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
@@ -136,7 +122,6 @@ void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
wxLog::OnLog(level, s_szBuf, time(NULL)); wxLog::OnLog(level, s_szBuf, time(NULL));
} }
>>>>>>> 1.93.2.3
} }
#define IMPLEMENT_LOG_FUNCTION(level) \ #define IMPLEMENT_LOG_FUNCTION(level) \