From ca588b2cba16bf07d9ffabd668c8e69baf928ca2 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 16 Feb 2011 22:58:53 +0000 Subject: [PATCH] Applied #10576: msw build fails when using watcom with no-threads option git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@66924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/thread.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/thread.h b/include/wx/thread.h index bad0af9b73..5143be54b0 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -693,11 +693,13 @@ inline void WXDLLIMPEXP_BASE wxMutexGuiLeave() { } // macros for entering/leaving critical sections which may be used without // having to take them inside "#if wxUSE_THREADS" -// (the implementation uses dummy structs to force semicolon after the macro) +// (the implementation uses dummy structs to force semicolon after the macro; +// also notice that Watcom doesn't like declaring a struct as a member so we +// need to actually define it in wxCRIT_SECT_DECLARE_MEMBER) #define wxENTER_CRIT_SECT(cs) do {} while (0) #define wxLEAVE_CRIT_SECT(cs) do {} while (0) #define wxCRIT_SECT_DECLARE(cs) struct wxDummyCS##cs -#define wxCRIT_SECT_DECLARE_MEMBER(cs) struct wxDummyCSMember##cs +#define wxCRIT_SECT_DECLARE_MEMBER(cs) struct wxDummyCSMember##cs { } #define wxCRIT_SECT_LOCKER(name, cs) struct wxDummyCSLocker##name // if there is only one thread, it is always the main one