From b053bf9ef4fa93ede7869438fa61e664b453ef18 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 28 Aug 2008 21:50:10 +0000 Subject: [PATCH] don't use new string caching code without compiler TLS support (temporary fix to compilation problems) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/string.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/wx/string.h b/include/wx/string.h index 50c4cc9296..845316e883 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -75,6 +75,12 @@ #define wxUSE_STRING_POS_CACHE 0 #endif +#ifndef wxHAS_COMPILER_TLS + // FIXME: currently the code only works with compiler TLS support + #undef wxUSE_STRING_POS_CACHE + #define wxUSE_STRING_POS_CACHE 0 +#endif + #if wxUSE_STRING_POS_CACHE #include "wx/tls.h" -- 2.45.2