[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[zoltan at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 164689cdabd3e58386bf04652415c8def2451870
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 12:13:53 2010 +0000

    2010-01-07  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Holger Freyther.
    
            [Mac] Build fix when FAST_MALLOC_MATCH_VALIDATION=1
            https://bugs.webkit.org/show_bug.cgi?id=33312
    
            Using of operator += cause compile error on Mac, so it is changed to
            "= static_cast<AllocAlignmentInteger*>(old_ptr) + 1".
    
            * wtf/FastMalloc.cpp:
            (WTF::TCMallocStats::realloc):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52918 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 660aa13..dbbbdd6 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Holger Freyther.
 
+        [Mac] Build fix when FAST_MALLOC_MATCH_VALIDATION=1
+        https://bugs.webkit.org/show_bug.cgi?id=33312
+
+        Using of operator += cause compile error on Mac, so it is changed to
+        "= static_cast<AllocAlignmentInteger*>(old_ptr) + 1".
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMallocStats::realloc):
+
+2010-01-07  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Holger Freyther.
+
         [Qt] Build fix when FAST_MALLOC_MATCH_VALIDATION=1
         https://bugs.webkit.org/show_bug.cgi?id=33312
 
diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
index a9b78eb..886dbe4 100644
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -3795,7 +3795,7 @@ void* realloc(void* old_ptr, size_t new_size) {
     return new_ptr;
   } else {
 #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
-    old_ptr += sizeof(AllocAlignmentInteger); // Set old_ptr back to the user pointer.
+    old_ptr = static_cast<AllocAlignmentInteger*>(old_ptr) + 1; // Set old_ptr back to the user pointer.
 #endif
     return old_ptr;
   }

-- 
WebKit Debian packaging