Changeset 53485 in webkit

Timestamp:

Jan 19, 2010 1:04:42 PM (14 years ago)

Author:

dbates@webkit.org

Message:

2010-01-19 Daniel Bates <​dbates@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:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/transforms/TransformationMatrix.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-19  Daniel Bates  <dbates@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@chromium.org>
 

trunk/WebCore/platform/graphics/transforms/TransformationMatrix.h

@@ -45 +45 @@
 
 #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