Enable variadic macros for VC9 and later.

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

diff --git a/include/wx/tls.h b/include/wx/tls.h
index f91368d503672fc04661f85d2aeb5befa75e1bee..4fbc287c5c16098fbfbab9c618ad23e823d703dc 100644 (file)
--- a/include/wx/tls.h
+++ b/include/wx/tls.h
@@ -50,7 +50,7 @@
         typedef void (*wxTlsDestructorFunction)(void*);
     }
 
-    #if defined(__WXMSW__)
+    #if defined(__WINDOWS__)
         #include "wx/msw/tls.h"
     #elif defined(__OS2__)
         #include "wx/os2/tls.h"
@@ -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