From 9d7cb6715f6bbb03895c5710b276a600a314d68d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 8 Sep 2009 11:21:45 +0000 Subject: [PATCH] Fix wxLog compilation with wxUSE_THREADS==0. Define WX_DEFINE_GLOBAL_VAR macro when wxUSE_THREADS==0 too, it is used for components level hash map in any case. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/log.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/log.cpp b/src/common/log.cpp index 6731ccb9d2..98d73a6dde 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -68,10 +68,6 @@ #undef wxLOG_COMPONENT const char *wxLOG_COMPONENT = ""; -#if wxUSE_THREADS - -wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar; - // this macro allows to define an object which will be initialized before any // other function in this file is called: this is necessary to allow log // functions to be used during static initialization (this is not advisable @@ -92,6 +88,10 @@ wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar; \ type *gs_##name##Ptr = &Get##name() +#if wxUSE_THREADS + +wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar; + namespace { -- 2.47.2