[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 c52fe5e5e26291948757b1443f4b203cbd67bba6
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 10 17:53:19 2001 +0000

    Hack to workaround name collision with Mac Fixed type
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@123 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 1307407..33d48fa 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -26,7 +26,9 @@
 #ifndef QSTRING_H_
 #define QSTRING_H_
 
+#define Fixed MacFixed
 #include <CoreFoundation/CFString.h>
+#undef Fixed
 #include "qcstring.h"
 
 class QString;
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 1307407..33d48fa 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -26,7 +26,9 @@
 #ifndef QSTRING_H_
 #define QSTRING_H_
 
+#define Fixed MacFixed
 #include <CoreFoundation/CFString.h>
+#undef Fixed
 #include "qcstring.h"
 
 class QString;
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 1307407..33d48fa 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -26,7 +26,9 @@
 #ifndef QSTRING_H_
 #define QSTRING_H_
 
+#define Fixed MacFixed
 #include <CoreFoundation/CFString.h>
+#undef Fixed
 #include "qcstring.h"
 
 class QString;

-- 
WebKit Debian packaging