Changeset 74802 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.cpp

Timestamp:

Dec 30, 2010, 11:34:03 AM (14 years ago)

Author:

Patrick Gansterer

Message:

2010-12-30 Patrick Gansterer <Patrick Gansterer>

Reviewed by Darin Adler.

Use OS(WINDOWS) instead of COMPILER(MSVC) in FastMalloc.cpp
​https://bugs.webkit.org/show_bug.cgi?id=51743

Most of the ifdefs belong to windows and not to the MSVC compiler.

• wtf/FastMalloc.cpp:

File:

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

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -212 +212 @@
 #if OS(DARWIN)
 #include <malloc/malloc.h>
-#elif COMPILER(MSVC)
+#elif OS(WINDOWS)
 #include <malloc.h>
 #endif
@@ -385 +385 @@
 #if OS(DARWIN)
     return malloc_size(p);
-#elif COMPILER(MSVC) && !PLATFORM(BREWMP)
+#elif OS(WINDOWS) && !PLATFORM(BREWMP)
     // Brew MP uses its own memory allocator, so _msize does not work on the Brew MP simulator.
     return _msize(const_cast<void*>(p));
@@ -2152 +2152 @@
  private:
   typedef TCMalloc_ThreadCache_FreeList FreeList;
-#if COMPILER(MSVC)
+#if OS(WINDOWS)
   typedef DWORD ThreadIdentifier;
 #else
@@ -2443 +2443 @@
 static bool tsd_inited = false;
 static pthread_key_t heap_key;
-#if COMPILER(MSVC)
+#if OS(WINDOWS)
 DWORD tlsIndex = TLS_OUT_OF_INDEXES;
 #endif
@@ -2452 +2452 @@
     // benefit from the delete callback.
     pthread_setspecific(heap_key, heap);
-#if COMPILER(MSVC)
+#if OS(WINDOWS)
     TlsSetValue(tlsIndex, heap);
 #endif
@@ -2963 +2963 @@
   if (KernelSupportsTLS())
     return threadlocal_heap;
-#elif COMPILER(MSVC)
+#elif OS(WINDOWS)
     return static_cast<TCMalloc_ThreadCache*>(TlsGetValue(tlsIndex));
 #else
@@ -2993 +2993 @@
   ASSERT(!tsd_inited);
   pthread_key_create(&heap_key, DestroyThreadCache);
-#if COMPILER(MSVC)
+#if OS(WINDOWS)
   tlsIndex = TlsAlloc();
 #endif
   tsd_inited = true;
     
-#if !COMPILER(MSVC)
+#if !OS(WINDOWS)
   // We may have used a fake pthread_t for the main thread.  Fix it.
   pthread_t zero;
@@ -3009 +3009 @@
 #endif
   for (TCMalloc_ThreadCache* h = thread_heaps; h != NULL; h = h->next_) {
-#if COMPILER(MSVC)
+#if OS(WINDOWS)
     if (h->tid_ == 0) {
       h->tid_ = GetCurrentThreadId();
@@ -3027 +3027 @@
     SpinLockHolder h(&pageheap_lock);
 
-#if COMPILER(MSVC)
+#if OS(WINDOWS)
     DWORD me;
     if (!tsd_inited) {
@@ -3048 +3048 @@
     // and added to the linked list.  So we search for that first.
     for (TCMalloc_ThreadCache* h = thread_heaps; h != NULL; h = h->next_) {
-#if COMPILER(MSVC)
+#if OS(WINDOWS)
       if (h->tid_ == me) {
 #else