[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[paroga at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit c8b40588ce32883d54aba3e4ee06a3d95401960e
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 14 22:57:51 2011 +0000

    2011-01-14  Patrick Gansterer  <paroga at webkit.org>
    
            Unreviewed Windows Release build fix.
    
            * wtf/FastMalloc.cpp:
            (WTF::TCMalloc_PageHeap::scavengerTimerFired):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75827 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 69050d2..38e5594 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -7,6 +7,13 @@
 
 2011-01-14  Patrick Gansterer  <paroga at webkit.org>
 
+        Unreviewed Windows Release build fix.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMalloc_PageHeap::scavengerTimerFired):
+
+2011-01-14  Patrick Gansterer  <paroga at webkit.org>
+
         Reviewed by Adam Roben.
 
         Use the Windows thread pool instead of an extra thread for FastMalloc scavenging
diff --git a/Source/JavaScriptCore/wtf/FastMalloc.cpp b/Source/JavaScriptCore/wtf/FastMalloc.cpp
index bce898b..0b4d0e6 100644
--- a/Source/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/Source/JavaScriptCore/wtf/FastMalloc.cpp
@@ -1459,7 +1459,7 @@ class TCMalloc_PageHeap {
   dispatch_source_t m_scavengeTimer;
   bool m_scavengingSuspended;
 #elif OS(WINDOWS)
-  static void CALLBACK scavengerTimerFired(void*, BOOLEAN)
+  static void CALLBACK scavengerTimerFired(void*, BOOLEAN);
   HANDLE m_scavengeQueueTimer;
 #else 
   static NO_RETURN_WITH_VALUE void* runScavengerThread(void*);
@@ -1545,7 +1545,7 @@ ALWAYS_INLINE void TCMalloc_PageHeap::suspendScavenger()
 
 #elif OS(WINDOWS)
 
-static void CALLBACK TCMalloc_PageHeap::scavengerTimerFired(void* context, BOOLEAN)
+void TCMalloc_PageHeap::scavengerTimerFired(void* context, BOOLEAN)
 {
     static_cast<TCMalloc_PageHeap*>(context)->periodicScavenge();
 }

-- 
WebKit Debian packaging