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

Watcom compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-08-22 18:15:23 +00:00
parent bb809a9a80
commit 1f5df26884
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/strvararg.h
View File

@@ -943,6 +943,8 @@ private:
#define _WX_VARARG_WATCOM_UNPACK(N, convfixed) \ #define _WX_VARARG_WATCOM_UNPACK(N, convfixed) \
_WX_VARARG_WATCOM_UNPACK_##N convfixed _WX_VARARG_WATCOM_UNPACK_##N convfixed
#define _WX_VARARG_PASS_WATCOM(i) a##i
#define _WX_VARARG_WATCOM_WORKAROUND(N, rettype, name, \ #define _WX_VARARG_WATCOM_WORKAROUND(N, rettype, name, \
convfixed, dummy, numfixed, fixed) \ convfixed, dummy, numfixed, fixed) \
template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)> \ template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)> \
@@ -950,7 +952,7 @@ private:
_WX_VARARG_JOIN(N, _WX_VARARG_ARG)) \ _WX_VARARG_JOIN(N, _WX_VARARG_ARG)) \
{ \ { \
return name(_WX_VARARG_WATCOM_UNPACK(numfixed, convfixed), \ return name(_WX_VARARG_WATCOM_UNPACK(numfixed, convfixed), \
_WX_VARARG_JOIN(N, _WX_VARARG_PASS_WCHAR)); \ _WX_VARARG_JOIN(N, _WX_VARARG_PASS_WATCOM)); \
} }
#define _WX_VARARG_WATCOM_WORKAROUND_CTOR(N, dummy1, name, \ #define _WX_VARARG_WATCOM_WORKAROUND_CTOR(N, dummy1, name, \
@@ -960,7 +962,7 @@ private:
_WX_VARARG_JOIN(N, _WX_VARARG_ARG)) \ _WX_VARARG_JOIN(N, _WX_VARARG_ARG)) \
{ \ { \
name(_WX_VARARG_WATCOM_UNPACK(numfixed, convfixed), \ name(_WX_VARARG_WATCOM_UNPACK(numfixed, convfixed), \
_WX_VARARG_JOIN(N, _WX_VARARG_PASS_WCHAR)); \ _WX_VARARG_JOIN(N, _WX_VARARG_PASS_WATCOM)); \
} }
#endif // __WATCOMC__ #endif // __WATCOMC__