[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 c395009a5f8096b5358e66bf030f4318e7336bf9
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 10 18:45:37 2001 +0000

    Hack to workaround name collision with Mac Rect and Boolean types
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 33d48fa..71366c6 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -27,8 +27,12 @@
 #define QSTRING_H_
 
 #define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #include <CoreFoundation/CFString.h>
 #undef Fixed
+#undef Rect
+#undef Boolean
 #include "qcstring.h"
 
 class QString;
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 33d48fa..71366c6 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -27,8 +27,12 @@
 #define QSTRING_H_
 
 #define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #include <CoreFoundation/CFString.h>
 #undef Fixed
+#undef Rect
+#undef Boolean
 #include "qcstring.h"
 
 class QString;
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 33d48fa..71366c6 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -27,8 +27,12 @@
 #define QSTRING_H_
 
 #define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #include <CoreFoundation/CFString.h>
 #undef Fixed
+#undef Rect
+#undef Boolean
 #include "qcstring.h"
 
 class QString;

-- 
WebKit Debian packaging