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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 54ab2a03e061842e00653786077c8f5c5dd51840
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 15:39:02 2010 +0000

    Roll out r55889, as it breaks the Qt port on Leopard
    
        2010-03-11  Kent Hansen  <kent.hansen at nokia.com>
    
                Reviewed by Simon Hausmann.
    
                Mac OS X: Use deployment target to determine whether memory tagging should be enabled
                https://bugs.webkit.org/show_bug.cgi?id=34888
    
                Use TARGETING_TIGER rather than BUILDING_ON_TIGER to determine the tags.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56062 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 27aab8f..7668a49 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -138,17 +138,6 @@
 
         * yarr/RegexInterpreter.cpp:
 
-2010-03-11  Kent Hansen  <kent.hansen at nokia.com>
-
-        Reviewed by Simon Hausmann.
-
-        Mac OS X: Use deployment target to determine whether memory tagging should be enabled
-        https://bugs.webkit.org/show_bug.cgi?id=34888
-
-        Use TARGETING_TIGER rather than BUILDING_ON_TIGER to determine the tags.
-
-        * wtf/VMTags.h:
-
 2010-03-11  Jedrzej Nowacki  <jedrzej.nowacki at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/wtf/VMTags.h b/JavaScriptCore/wtf/VMTags.h
index f1c294b..7ac02da 100644
--- a/JavaScriptCore/wtf/VMTags.h
+++ b/JavaScriptCore/wtf/VMTags.h
@@ -28,7 +28,7 @@
 
 // On Mac OS X, the VM subsystem allows tagging memory requested from mmap and vm_map
 // in order to aid tools that inspect system memory use. 
-#if OS(DARWIN) && !defined(TARGETING_TIGER)
+#if OS(DARWIN) && !defined(BUILDING_ON_TIGER)
 
 #include <mach/vm_statistics.h>
 
@@ -54,7 +54,7 @@
 #define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY VM_MAKE_TAG(69)
 #endif // defined(VM_MEMORY_WEBCORE_PURGEABLE_BUFFERS)
 
-#else // OS(DARWIN) && !defined(TARGETING_TIGER)
+#else // OS(DARWIN) && !defined(BUILDING_ON_TIGER)
 
 #define VM_TAG_FOR_TCMALLOC_MEMORY -1
 #define VM_TAG_FOR_COLLECTOR_MEMORY -1
@@ -62,6 +62,6 @@
 #define VM_TAG_FOR_REGISTERFILE_MEMORY -1
 #define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY -1
 
-#endif // OS(DARWIN) && !defined(TARGETING_TIGER)
+#endif // OS(DARWIN) && !defined(BUILDING_ON_TIGER)
 
 #endif // VMTags_h

-- 
WebKit Debian packaging