Changeset 65091 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Aug 10, 2010, 1:47:08 PM (15 years ago)

Author:

[email protected]

Message:

2010-08-10 Patrick Gansterer <​[email protected]>

Reviewed by Eric Seidel.

Make FastMalloc more portable.
​https://bugs.webkit.org/show_bug.cgi?id=41790

• wtf/FastMalloc.cpp: (WTF::TCMalloc_Central_FreeList::Populate): (WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):

File:

• trunk/JavaScriptCore/wtf/FastMalloc.cpp (modified) (4 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -416 +416 @@
 #include "TCSystemAlloc.h"
 #include <algorithm>
-#include <errno.h>
 #include <limits>
 #include <pthread.h>
@@ -422 +421 @@
 #include <stddef.h>
 #include <stdio.h>
+#if HAVE(ERRNO_H)
+#include <errno.h>
+#endif
 #if OS(UNIX)
 #include <unistd.h>
 #endif
-#if COMPILER(MSVC)
+#if OS(WINDOWS)
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
@@ -2688 +2690 @@
   }
   if (span == NULL) {
+#if HAVE(ERRNO_H)
     MESSAGE("allocation failed: %d\n", errno);
+#elif OS(WINDOWS)
+    MESSAGE("allocation failed: %d\n", ::GetLastError());
+#else
+    MESSAGE("allocation failed\n");
+#endif
     lock_.Lock();
     return;
@@ -3055 +3063 @@
 
   heap->in_setspecific_ = true;
-  pthread_setspecific(heap_key, NULL);
+  setThreadHeap(NULL);
 #ifdef HAVE_TLS
   // Also update the copy in __thread