Title: [94952] trunk/Source/_javascript_Core
- Revision
- 94952
- Author
- [email protected]
- Date
- 2011-09-12 04:03:02 -0700 (Mon, 12 Sep 2011)
Log Message
Unreviewed build fix after r94871.
* runtime/InitializeThreading.cpp:
(JSC::initializeThreadingOnce):
* wtf/FastMalloc.cpp:
* wtf/RefCountedLeakCounter.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (94951 => 94952)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-12 09:48:39 UTC (rev 94951)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-12 11:03:02 UTC (rev 94952)
@@ -1,3 +1,12 @@
+2011-09-12 Patrick Gansterer <[email protected]>
+
+ Unreviewed build fix after r94871.
+
+ * runtime/InitializeThreading.cpp:
+ (JSC::initializeThreadingOnce):
+ * wtf/FastMalloc.cpp:
+ * wtf/RefCountedLeakCounter.h:
+
2011-09-11 Filip Pizlo <[email protected]>
DFGNode.h has macros that indicate the enabling of a feature, but
Modified: trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp (94951 => 94952)
--- trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp 2011-09-12 09:48:39 UTC (rev 94951)
+++ trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp 2011-09-12 11:03:02 UTC (rev 94952)
@@ -56,7 +56,9 @@
WriteBarrierCounters::initialize();
#endif
JSGlobalData::storeVPtrs();
+#if ENABLE(JIT) && ENABLE(ASSEMBLER)
ExecutableAllocator::initializeAllocator();
+#endif
#if ENABLE(JSC_MULTIPLE_THREADS)
RegisterFile::initializeThreading();
#endif
Modified: trunk/Source/_javascript_Core/wtf/FastMalloc.cpp (94951 => 94952)
--- trunk/Source/_javascript_Core/wtf/FastMalloc.cpp 2011-09-12 09:48:39 UTC (rev 94951)
+++ trunk/Source/_javascript_Core/wtf/FastMalloc.cpp 2011-09-12 11:03:02 UTC (rev 94952)
@@ -80,11 +80,11 @@
#include "Assertions.h"
#include <limits>
#if ENABLE(WTF_MULTIPLE_THREADS)
-#if OS(WINDOWS) && PLATFORM(CHROMIUM)
+#if OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
#include <windows.h>
#else
#include <pthread.h>
-#endif // OS(WINDOWS)
+#endif // OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
#endif
#include <wtf/StdLibExtras.h>
@@ -107,8 +107,13 @@
namespace WTF {
#if ENABLE(WTF_MULTIPLE_THREADS)
-#if OS(WINDOWS) && PLATFORM(CHROMIUM)
+#if OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
+// TLS_OUT_OF_INDEXES is not defined on WinCE.
+#ifndef TLS_OUT_OF_INDEXES
+#define TLS_OUT_OF_INDEXES 0xffffffff
+#endif
+
static DWORD isForibiddenTlsIndex = TLS_OUT_OF_INDEXES;
static const LPVOID kTlsAllowValue = reinterpret_cast<LPVOID>(0); // Must be zero.
static const LPVOID kTlsForbiddenValue = reinterpret_cast<LPVOID>(1);
@@ -165,7 +170,7 @@
pthread_once(&isForbiddenKeyOnce, initializeIsForbiddenKey);
pthread_setspecific(isForbiddenKey, 0);
}
-#endif // OS(WINDOWS) && PLATFORM(CHROMIUM)
+#endif // OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
#else
static bool staticIsForbidden;
Modified: trunk/Source/_javascript_Core/wtf/RefCountedLeakCounter.h (94951 => 94952)
--- trunk/Source/_javascript_Core/wtf/RefCountedLeakCounter.h 2011-09-12 09:48:39 UTC (rev 94951)
+++ trunk/Source/_javascript_Core/wtf/RefCountedLeakCounter.h 2011-09-12 11:03:02 UTC (rev 94952)
@@ -38,7 +38,11 @@
#ifndef NDEBUG
private:
+#if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE)
+ int m_count;
+#else
volatile int m_count;
+#endif
const char* m_description;
#endif
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
