X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49e714e127fb21392772f0f61bed7efe5e73cf2a..6041f69ca7bbb7c39e4ba64e407bc3ac39e3687f:/include/wx/tls.h

diff --git a/include/wx/tls.h b/include/wx/tls.h
index bd4e9bad7a..996fa251dd 100644
--- a/include/wx/tls.h
+++ b/include/wx/tls.h
@@ -22,10 +22,10 @@
 #if !wxUSE_THREADS
     #define wxHAS_COMPILER_TLS
     #define wxTHREAD_SPECIFIC_DECL
-// __thread keyword is supported if configure detected it or when using mingw32
-// >= 4.3 which is known to have it too
-#elif defined(HAVE___THREAD_KEYWORD) || \
-        (defined(__MINGW32__) && wxCHECK_GCC_VERSION(4, 3))
+// __thread keyword is not supported correctly by MinGW, at least in some
+// configurations, see http://sourceforge.net/support/tracker.php?aid=2837047
+// and when in doubt we prefer to not use it at all.
+#elif defined(HAVE___THREAD_KEYWORD) && !defined(__MINGW32__)
     #define wxHAS_COMPILER_TLS
     #define wxTHREAD_SPECIFIC_DECL __thread
 // MSVC has its own version which might be supported by some other Windows
@@ -132,7 +132,7 @@
     };
 
     #define wxTLS_TYPE(T) wxTlsValue<T>
-    #define wxTLS_PTR(var) (var)
+    #define wxTLS_PTR(var) ((var).Get())
     #define wxTLS_VALUE(var) (*(var))
 #endif // wxHAS_COMPILER_TLS/!wxHAS_COMPILER_TLS