[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dbates at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 127f350f47f9660f309709a314afe3a45b685052
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 19 21:04:42 2010 +0000

    2010-01-19  Daniel Bates  <dbates at webkit.org>
    
            Reviewed by Adam Roben.
    
            https://bugs.webkit.org/show_bug.cgi?id=33822
    
            REGRESSION(r53273): Fixes redefinition of XFORM error when building
            WebKit using Qt Windows with the MinGW compiler.
    
            Note, MinGW has a slightly different declaration of the struct XFORM
            from that in the Microsoft SDK. So, we need to substitute an alternative
            typedef for XFORM when compiling with MinGW.
    
            No functionality was changed. So, no new tests.
    
            * platform/graphics/transforms/TransformationMatrix.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5b77beb..da5b051 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-19  Daniel Bates  <dbates at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33822
+
+        REGRESSION(r53273): Fixes redefinition of XFORM error when building
+        WebKit using Qt Windows with the MinGW compiler.
+ 
+        Note, MinGW has a slightly different declaration of the struct XFORM
+        from that in the Microsoft SDK. So, we need to substitute an alternative
+        typedef for XFORM when compiling with MinGW.
+
+        No functionality was changed. So, no new tests.
+
+        * platform/graphics/transforms/TransformationMatrix.h:
+
 2010-01-19  Stephen White  <senorblanco at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/graphics/transforms/TransformationMatrix.h b/WebCore/platform/graphics/transforms/TransformationMatrix.h
index 028294c..787b3ab 100644
--- a/WebCore/platform/graphics/transforms/TransformationMatrix.h
+++ b/WebCore/platform/graphics/transforms/TransformationMatrix.h
@@ -44,8 +44,12 @@
 #endif
 
 #if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(WX) && OS(WINDOWS))
+#if COMPILER(MINGW)
+typedef struct _XFORM XFORM;
+#else
 typedef struct tagXFORM XFORM;
 #endif
+#endif
 
 namespace WebCore {
 

-- 
WebKit Debian packaging