X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea44a6310ed57464258c6337dcc749197338c79f..373658eb493827a9a68a79eeaaab1dbfc69a206b:/include/wx/log.h diff --git a/include/wx/log.h b/include/wx/log.h index 006e8a4672..7e88d578a0 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -475,11 +475,11 @@ WXDLLEXPORT const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0); // ------------------- #define DECLARE_LOG_FUNCTION(level) \ -extern void WXDLLEXPORT wxLog##level(const wxChar *szFormat, \ +extern void WXDLLEXPORT wxVLog##level(const wxChar *szFormat, \ va_list argptr); \ extern void WXDLLEXPORT wxLog##level(const wxChar *szFormat, ...) #define DECLARE_LOG_FUNCTION2(level, arg1) \ -extern void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, \ +extern void WXDLLEXPORT wxVLog##level(arg1, const wxChar *szFormat, \ va_list argptr); \ extern void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...) @@ -487,11 +487,11 @@ extern void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...) // log functions do nothing at all #define DECLARE_LOG_FUNCTION(level) \ -inline void WXDLLEXPORT wxLog##level(const wxChar *szFormat, \ +inline void WXDLLEXPORT wxVLog##level(const wxChar *szFormat, \ va_list argptr) {} \ inline void WXDLLEXPORT wxLog##level(const wxChar *szFormat, ...) {} #define DECLARE_LOG_FUNCTION2(level, arg1) \ -inline void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, \ +inline void WXDLLEXPORT wxVLog##level(arg1, const wxChar *szFormat, \ va_list argptr) {} \ inline void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...) {} @@ -541,13 +541,13 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode); DECLARE_LOG_FUNCTION2(Trace, wxTraceMask mask); #else //!debug // these functions do nothing in release builds - inline void wxLogDebug(const wxChar *, va_list) { } + inline void wxVLogDebug(const wxChar *, va_list) { } inline void wxLogDebug(const wxChar *, ...) { } - inline void wxLogTrace(const wxChar *, va_list) { } + inline void wxVLogTrace(const wxChar *, va_list) { } inline void wxLogTrace(const wxChar *, ...) { } - inline void wxLogTrace(wxTraceMask, const wxChar *, va_list) { } + inline void wxVLogTrace(wxTraceMask, const wxChar *, va_list) { } inline void wxLogTrace(wxTraceMask, const wxChar *, ...) { } - inline void wxLogTrace(const wxChar *, const wxChar *, va_list) { } + inline void wxVLogTrace(const wxChar *, const wxChar *, va_list) { } inline void wxLogTrace(const wxChar *, const wxChar *, ...) { } #endif // debug/!debug