From: Václav Slavík Date: Mon, 30 Apr 2007 12:08:01 +0000 (+0000) Subject: fixed release build compilation with compilers without __VA_ARGS__ X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/44be939a5e05eb22f846554ad3bf90380d7168b1 fixed release build compilation with compilers without __VA_ARGS__ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/log.h b/include/wx/log.h index 85c09841d1..c9f16abf15 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -665,10 +665,16 @@ DECLARE_LOG_FUNCTION2(SysError, unsigned long, lErrCode); #define wxLogTrace(mask, fmt, ...) wxLogNop() #else // !HAVE_VARIADIC_MACROS //inline void wxLogDebug(const wxString& fmt, ...) {} - WX_DEFINE_VARARG_FUNC_NOP(wxLogDebug) + WX_DEFINE_VARARG_FUNC_NOP(wxLogDebug, 1, (const wxString&)) //inline void wxLogTrace(wxTraceMask, const wxString& fmt, ...) {} //inline void wxLogTrace(const wxString&, const wxString& fmt, ...) {} - WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace) + WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (wxTraceMask, const wxString&)) + WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const wxString&, const wxString&)) + #ifdef __WATCOMC__ + // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351 + WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const char*, const char*)) + WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const wchar_t*, const wchar_t*)) + #endif #endif // HAVE_VARIADIC_MACROS/!HAVE_VARIADIC_MACROS #endif // debug/!debug