renamed GetColHeader() to GetGridColHeader() for consistency with the other existing...

[wxWidgets.git] / include / wx / tls.h

diff --git a/include/wx/tls.h b/include/wx/tls.h
index 19027160689bd6ec564bf453515470e084d1ee98..7846af1e3be75f25648ac3accfe755946fe80034 100644 (file)
--- a/include/wx/tls.h
+++ b/include/wx/tls.h
@@ -46,6 +46,8 @@
 #else // !wxHAS_COMPILER_TLS
     #ifdef __WXMSW__
         #include "wx/msw/tls.h"
+    #elif defined(__OS2__)
+        #include "wx/os2/tls.h"
     #elif defined(__UNIX__)
         #include "wx/unix/tls.h"
     #else
@@ -71,7 +73,7 @@
         //        there somehow (probably by keeping a list of all TLS objects
         //        and cleaning them up in wxThread cleanup)
         wxTlsValue()
-#ifdef __UNIX__
+#if !defined(__OS2__) && defined(__UNIX__)
             : m_key(free)
 #endif
         {