[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit e9a1379cd2980b2cef05ee4a9bc42824fc2eaaaa
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 14 20:39:23 2009 +0000

    Roll out r49580 as it is completely wrong and breaks the Mac builds.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49583 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index fa6bb56..e3f3cd9 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,12 +1,5 @@
 2009-10-14  Kevin Ollivier  <kevino at theolliviers.com>
 
-        Mac build fix, use MIN_REQUIRED rather than MAX_ALLOWED to determine
-        compilation of code that requires 10.6.
-
-        * wtf/Platform.h:
-
-2009-10-14  Kevin Ollivier  <kevino at theolliviers.com>
-
         wx build fix. Set ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH for plugins while we're still building stubs.
 
         * wtf/Platform.h:
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 5bde6aa..3315d96 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -551,7 +551,7 @@
 #define HAVE_SYS_TIME_H 1
 #define HAVE_SYS_TIMEB_H 1
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 && !PLATFORM(IPHONE)
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE)
 #define HAVE_MADV_FREE_REUSE 1
 #define HAVE_MADV_FREE 1
 #define HAVE_PTHREAD_SETNAME_NP 1

-- 
WebKit Debian packaging