JavaScriptCore-621.1.tar.gz

[apple/javascriptcore.git] / wtf / ThreadSpecificWin.cpp

diff --git a/wtf/ThreadSpecificWin.cpp b/wtf/ThreadSpecificWin.cpp
index 1a3febbf62d76fe95b54368730821cb3de457532..f2c0cad95766558f0f69e2457490fea8bf558e45 100644 (file)
--- a/wtf/ThreadSpecificWin.cpp
+++ b/wtf/ThreadSpecificWin.cpp
@@ -29,14 +29,23 @@
 
 namespace WTF {
 
 
 namespace WTF {
 

-long g_tls_key_count = 0;
-DWORD g_tls_keys[kMaxTlsKeySize];
+long& tlsKeyCount()
+{
+    static long count;
+    return count;
+}
+
+DWORD* tlsKeys()
+{
+    static DWORD keys[kMaxTlsKeySize];
+    return keys;
+}

 
 void ThreadSpecificThreadExit()
 {
 
 void ThreadSpecificThreadExit()
 {

-    for (long i = 0; i < g_tls_key_count; i++) {
+    for (long i = 0; i < tlsKeyCount(); i++) {

         // The layout of ThreadSpecific<T>::Data does not depend on T. So we are safe to do the static cast to ThreadSpecific<int> in order to access its data member.
         // The layout of ThreadSpecific<T>::Data does not depend on T. So we are safe to do the static cast to ThreadSpecific<int> in order to access its data member.

-        ThreadSpecific<int>::Data* data = static_cast<ThreadSpecific<int>::Data*>(TlsGetValue(g_tls_keys[i]));
+        ThreadSpecific<int>::Data* data = static_cast<ThreadSpecific<int>::Data*>(TlsGetValue(tlsKeys()[i]));

         if (data)
             data->destructor(data);
     }
         if (data)
             data->destructor(data);
     }