[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 424b9d3e542222649c02941ec47ef236cd5bc6e5
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 29 01:33:19 2001 +0000

    Added hack from qstring.h to prevent Fixed, Rect, and Boolean problem
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@232 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index 4eb5306..2a1f005 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -34,7 +34,13 @@
 #include <qstring.h>
 
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #import <Cocoa/Cocoa.h>
+#undef Fixed
+#undef Rect
+#undef Boolean
 #endif
 
 
diff --git a/WebCore/kwq/KWQFont.h b/WebCore/kwq/KWQFont.h
index 27dcb7d..4162c15 100644
--- a/WebCore/kwq/KWQFont.h
+++ b/WebCore/kwq/KWQFont.h
@@ -33,7 +33,13 @@
 class QString;
 
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #import <Cocoa/Cocoa.h>
+#undef Fixed
+#undef Rect
+#undef Boolean
 #endif
 
 // class QFont =================================================================
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index 4eb5306..2a1f005 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -34,7 +34,13 @@
 #include <qstring.h>
 
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #import <Cocoa/Cocoa.h>
+#undef Fixed
+#undef Rect
+#undef Boolean
 #endif
 
 
diff --git a/WebCore/kwq/qt/qfont.h b/WebCore/kwq/qt/qfont.h
index 27dcb7d..4162c15 100644
--- a/WebCore/kwq/qt/qfont.h
+++ b/WebCore/kwq/qt/qfont.h
@@ -33,7 +33,13 @@
 class QString;
 
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #import <Cocoa/Cocoa.h>
+#undef Fixed
+#undef Rect
+#undef Boolean
 #endif
 
 // class QFont =================================================================
diff --git a/WebCore/src/kwq/qt/qcolor.h b/WebCore/src/kwq/qt/qcolor.h
index 4eb5306..2a1f005 100644
--- a/WebCore/src/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/qt/qcolor.h
@@ -34,7 +34,13 @@
 #include <qstring.h>
 
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #import <Cocoa/Cocoa.h>
+#undef Fixed
+#undef Rect
+#undef Boolean
 #endif
 
 
diff --git a/WebCore/src/kwq/qt/qfont.h b/WebCore/src/kwq/qt/qfont.h
index 27dcb7d..4162c15 100644
--- a/WebCore/src/kwq/qt/qfont.h
+++ b/WebCore/src/kwq/qt/qfont.h
@@ -33,7 +33,13 @@
 class QString;
 
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
 #import <Cocoa/Cocoa.h>
+#undef Fixed
+#undef Rect
+#undef Boolean
 #endif
 
 // class QFont =================================================================

-- 
WebKit Debian packaging