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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit 12d9ea1ee89b081249f8603ba64319e6a35febe2
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 11 01:52:12 2001 +0000

    Redefine Fixed around include of Cocoa.h for build voodoo
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@309 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQKGlobal.mm b/WebCore/kwq/KWQKGlobal.mm
index e67d179..b2544e0 100644
--- a/WebCore/kwq/KWQKGlobal.mm
+++ b/WebCore/kwq/KWQKGlobal.mm
@@ -26,7 +26,13 @@
 
 #include <kglobal.h>
 
+#define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #include <Cocoa/Cocoa.h>
+#undef Fixed
+#undef Rect
+#undef Boolean
 
 KInstance *KGlobal::instance()
 {
diff --git a/WebCore/src/kwq/KWQKGlobal.mm b/WebCore/src/kwq/KWQKGlobal.mm
index e67d179..b2544e0 100644
--- a/WebCore/src/kwq/KWQKGlobal.mm
+++ b/WebCore/src/kwq/KWQKGlobal.mm
@@ -26,7 +26,13 @@
 
 #include <kglobal.h>
 
+#define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #include <Cocoa/Cocoa.h>
+#undef Fixed
+#undef Rect
+#undef Boolean
 
 KInstance *KGlobal::instance()
 {

-- 
WebKit Debian packaging