[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 62f30ddb8dad8d990170fc2882ee51b2d60bea2c
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 9 21:59:59 2003 +0000

    	Make definition of kMin and kMax match the KHTML trunk.  Someone still needs to eliminate uses of QMIN
    	and QMAX from the code.
    
            * kwq/KWQDef.h:
            (kMin):
            (kMax):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5159 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a20751d..6514e60 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-10-09  David Hyatt  <hyatt at apple.com>
+
+	Make definition of kMin and kMax match the KHTML trunk.  Someone still needs to eliminate uses of QMIN
+	and QMAX from the code.
+
+        * kwq/KWQDef.h:
+        (kMin):
+        (kMax):
+
 2003-10-09  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3333897>: should support navigator.plugins.refresh as a way to add a plugin without restarting Safari
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a20751d..6514e60 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-10-09  David Hyatt  <hyatt at apple.com>
+
+	Make definition of kMin and kMax match the KHTML trunk.  Someone still needs to eliminate uses of QMIN
+	and QMAX from the code.
+
+        * kwq/KWQDef.h:
+        (kMin):
+        (kMax):
+
 2003-10-09  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3333897>: should support navigator.plugins.refresh as a way to add a plugin without restarting Safari
diff --git a/WebCore/kwq/KWQDef.h b/WebCore/kwq/KWQDef.h
index 767ee7d..5582d68 100644
--- a/WebCore/kwq/KWQDef.h
+++ b/WebCore/kwq/KWQDef.h
@@ -39,8 +39,14 @@ typedef unsigned int Q_UINT32;
 #define QMAX(a,b) ((a) > (b) ? (a) : (b))
 #define QMIN(a,b) ((a) < (b) ? (a) : (b))
 
-#define KMAX(a,b) QMAX(a, b)
-#define KMIN(a,b) QMIN(a, b)
+#define KMAX(a,b) kMax(a, b)
+#define KMIN(a,b) kMin(a, b)
+
+template<class T>
+inline const T& kMin ( const T& a, const T& b ) { return a < b ? a : b; }
+
+template<class T>
+inline const T& kMax ( const T& a, const T& b ) { return b < a ? a : b; }
 
 #define QABS(a) (((a) >= 0) ? (a) : -(a))
 

-- 
WebKit Debian packaging