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

fix compation with Watcom after latest vararg templates changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-06 14:11:14 +00:00
parent f74a73b365
commit 59a14f6984
8 changed files with 183 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/log.cpp
View File

@@ -337,7 +337,7 @@ void wxDoLogVerboseUtf8(const char *format, ...)
#ifdef __WATCOMC__
// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
void wxDoLogTrace(int mask, const wxChar *format, ...)
void wxDoLogTraceWchar(int mask, const wxChar *format, ...)
{
va_list argptr;
va_start(argptr, format);
@@ -345,7 +345,7 @@ void wxDoLogVerboseUtf8(const char *format, ...)
va_end(argptr);
}
void wxDoLogTrace(const char *mask, const wxChar *format, ...)
void wxDoLogTraceWchar(const char *mask, const wxChar *format, ...)
{
va_list argptr;
va_start(argptr, format);
@@ -353,7 +353,7 @@ void wxDoLogVerboseUtf8(const char *format, ...)
va_end(argptr);
}
void wxDoLogTrace(const wchar_t *mask, const wxChar *format, ...)
void wxDoLogTraceWchar(const wchar_t *mask, const wxChar *format, ...)
{
va_list argptr;
va_start(argptr, format);
@@ -441,7 +441,7 @@ void WXDLLEXPORT wxDoLogSysErrorUtf8(long lErrCode, const char *format, ...)
#ifdef __WATCOMC__
// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
void WXDLLEXPORT wxDoLogSysError(unsigned long lErrCode, const wxChar *format, ...)
void WXDLLEXPORT wxDoLogSysErrorWchar(unsigned long lErrCode, const wxChar *format, ...)
{
va_list argptr;
va_start(argptr, format);
@@ -449,7 +449,7 @@ void WXDLLEXPORT wxDoLogSysError(unsigned long lErrCode, const wxChar *format, .
va_end(argptr);
}
void WXDLLEXPORT wxVLogSysError(unsigned long err, const wxChar *format, va_list argptr)
void WXDLLEXPORT wxVLogSysError(unsigned long err, const wxString& format, va_list argptr)
{ wxVLogSysError((long)err, format, argptr); }
#endif // __WATCOMC__