Title: [100152] trunk/Source/_javascript_Core
- Revision
- 100152
- Author
- [email protected]
- Date
- 2011-11-14 09:01:39 -0800 (Mon, 14 Nov 2011)
Log Message
[WIN] Remove dependency on pthread from FastMalloc
https://bugs.webkit.org/show_bug.cgi?id=72098
Reviewed by Adam Roben.
All pthread calls are already ported to native Windows calls.
Use the native version for all OS(WINDOWS) to remove the
runtime dependency on the pthread dll.
* wtf/FastMalloc.cpp:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (100151 => 100152)
--- trunk/Source/_javascript_Core/ChangeLog 2011-11-14 16:59:15 UTC (rev 100151)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-11-14 17:01:39 UTC (rev 100152)
@@ -1,3 +1,16 @@
+2011-11-14 Patrick Gansterer <[email protected]>
+
+ [WIN] Remove dependency on pthread from FastMalloc
+ https://bugs.webkit.org/show_bug.cgi?id=72098
+
+ Reviewed by Adam Roben.
+
+ All pthread calls are already ported to native Windows calls.
+ Use the native version for all OS(WINDOWS) to remove the
+ runtime dependency on the pthread dll.
+
+ * wtf/FastMalloc.cpp:
+
2011-11-14 Simon Hausmann <[email protected]>
[Qt] Replace use of QApplication with QGuiApplication.
Modified: trunk/Source/_javascript_Core/wtf/FastMalloc.cpp (100151 => 100152)
--- trunk/Source/_javascript_Core/wtf/FastMalloc.cpp 2011-11-14 16:59:15 UTC (rev 100151)
+++ trunk/Source/_javascript_Core/wtf/FastMalloc.cpp 2011-11-14 17:01:39 UTC (rev 100152)
@@ -79,11 +79,11 @@
#include "Assertions.h"
#include <limits>
-#if OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
+#if OS(WINDOWS)
#include <windows.h>
#else
#include <pthread.h>
-#endif // OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
+#endif
#include <wtf/StdLibExtras.h>
#include <string.h>
@@ -109,7 +109,7 @@
#ifndef NDEBUG
namespace WTF {
-#if OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
+#if OS(WINDOWS)
// TLS_OUT_OF_INDEXES is not defined on WinCE.
#ifndef TLS_OUT_OF_INDEXES
@@ -144,7 +144,7 @@
TlsSetValue(isForibiddenTlsIndex, kTlsAllowValue);
}
-#else // !OS(WINDOWS) || !PLATFORM(CHROMIUM)
+#else // !OS(WINDOWS)
static pthread_key_t isForbiddenKey;
static pthread_once_t isForbiddenKeyOnce = PTHREAD_ONCE_INIT;
@@ -172,7 +172,7 @@
pthread_once(&isForbiddenKeyOnce, initializeIsForbiddenKey);
pthread_setspecific(isForbiddenKey, 0);
}
-#endif // OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
+#endif // OS(WINDOWS)
} // namespace WTF
#endif // NDEBUG
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
