Changeset 66883 in webkit

Timestamp:

Sep 7, 2010 8:15:58 AM (14 years ago)

Author:

zoltan@webkit.org

Message:

2010-09-07 Zoltan Horvath <​zoltan@webkit.org>

Reviewed by Darin Adler.

REGRESSION(66741): Undefined pthread macros
​https://bugs.webkit.org/show_bug.cgi?id=45246

PTHREAD_MUTEX_NORMAL and PTHREAD_MUTEX_DEFAULT (introduced in r60487) are not defined on Linux,
but used in a statement. Add an additional check to test this.

• wtf/FastMalloc.cpp: (WTF::TCMalloc_PageHeap::initializeScavenger):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/FastMalloc.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-09-07  Zoltan Horvath  <zoltan@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION(66741): Undefined pthread macros
+        https://bugs.webkit.org/show_bug.cgi?id=45246
+
+        PTHREAD_MUTEX_NORMAL and PTHREAD_MUTEX_DEFAULT (introduced in r60487) are not defined on Linux, 
+        but used in a statement. Add an additional check to test this.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMalloc_PageHeap::initializeScavenger):
+
 2010-09-06  Oliver Hunt  <oliver@apple.com>
 

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -1494 +1494 @@
 {
     // Create a non-recursive mutex.
-#if PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_DEFAULT
+#if !defined(PTHREAD_MUTEX_NORMAL) || PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_DEFAULT
     pthread_mutex_init(&m_scavengeMutex, 0);
 #else