[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[zoltan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e430c80da2d07aa4e766b36a440cf4d08061fb35
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 7 15:15:58 2010 +0000

    2010-09-07  Zoltan Horvath  <zoltan at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66883 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9a357b5..a7a5241 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-07  Zoltan Horvath  <zoltan at 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 at apple.com>
 
         Windows build fix
diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
index cd0f17e..0f240ff 100644
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -1493,7 +1493,7 @@ void TCMalloc_PageHeap::init()
 void TCMalloc_PageHeap::initializeScavenger()
 {
     // 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
     pthread_mutexattr_t attr;

-- 
WebKit Debian packaging