33822 2010-01-18 18:36:08 -0800 REGRESSION(r53273): TransformationMatrix.h needs to use alternative typedef for XFORM when compiling with MinGW 2010-01-19 13:05:25 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows XP RESOLVED FIXED Qt P2 Blocker --- 1 dbates webkit-unassigned aroben jturcotte ossy sfalken zoltan oldest_to_newest 182088 0 dbates 2010-01-18 18:36:08 -0800 Changeset 53273 <http://trac.webkit.org/changeset/53273> broke the Qt Windows build when using the MinGW compiler. In particular, we cannot typedef/forward-declare XFORM in TransformationMatrix.h because this causes a redefinition error with the struct of the same name defined in C:\Qt\2009.05\mingw\include\wingdi.h. Also, the MinGW wingdi.h does not define the macro definition _XFORM_ (like in the Microsoft SDK), so we cannot determine whether this struct is already defined using the preprocessor. For completeness, the following is a snippet from the build output including the error message: .\..\JavaScriptCore\pcre" [...] -o obj\debug\SVGElementFactory.o generated\SVG ElementFactory.cpp In file included from ..\..\..\WebCore\svg/SVGTransform.h:25, from ..\..\..\WebCore\svg/SVGTransformList.h:26, from ..\..\..\WebCore\svg/SVGTransformable.h:27, from ..\..\..\WebCore\svg/SVGStyledTransformableElement.h:27, from ..\..\..\WebCore\svg/SVGAElement.h:28, from generated\SVGElementFactory.cpp:34: ..\..\..\WebCore\platform\graphics\transforms/TransformationMatrix.h:47: error: conflicting declaration 'typedef struct tagXFORM XFORM' c:\qt\2009.05\mingw\bin\../lib/gcc/mingw32/4.4.0/../../../../include/wingdi.h:16 34: error: 'XFORM' has a previous declaration as 'typedef struct _XFORM XFORM' make[2]: *** [obj/debug/SVGElementFactory.o] Error 1 182090 1 46877 dbates 2010-01-18 18:38:33 -0800 Created attachment 46877 Patch No functionality was changed. So, no new tests. 182126 2 mrowe 2010-01-18 21:04:26 -0800 Why on earth would MinGW declare this type in a manner that conflicts with how the Windows API declares it? 182220 3 46877 aroben 2010-01-19 06:39:50 -0800 Comment on attachment 46877 Patch We try to avoid including headers from other headers whenever possible, in an effort to reduce code size and compile times. Can we just insert the correct forward-declaration for MinGW as appropriate? 182337 4 46929 dbates 2010-01-19 11:27:28 -0800 Created attachment 46929 Patch Modified the patch based on a conversation with Adam Roben on IRC today (01/19). 182365 5 46929 aroben 2010-01-19 12:16:49 -0800 Comment on attachment 46929 Patch r=me 182400 6 46929 dbates 2010-01-19 13:05:18 -0800 Comment on attachment 46929 Patch Clearing flags on attachment: 46929 Committed r53485: <http://trac.webkit.org/changeset/53485> 182401 7 dbates 2010-01-19 13:05:25 -0800 All reviewed patches have been landed. Closing bug. 46877 2010-01-18 18:38:33 -0800 2010-01-19 11:27:28 -0800 Patch Bug33822.patch text/plain 1632 dbates SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzQ0NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDEtMTggIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJraXQu b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzgyMgorCisgICAgICAgIFJF R1JFU1NJT04ocjUzMjczKTogRml4ZXMgcmVkZWZpbml0aW9uIG9mIFhGT1JNIGVycm9yIHdoZW4g YnVpbGRpbmcKKyAgICAgICAgV2ViS2l0IHVzaW5nIFF0IFdpbmRvd3Mgd2l0aCB0aGUgTWluR1cg Y29tcGlsZXIuCisgCisgICAgICAgIFdlIGNhbm5vdCB0eXBlZGVmIFhGT1JNIGJlY2F1c2UgQzpc UXRcMjAwOS4wNVxtaW5nd1xpbmNsdWRlXHdpbmdkaS5oCisgICAgICAgIGFscmVhZHkgZG9lcy4g TW9yZW92ZXIsIHdlIGNhbm5vdCBza2lwIHRoZSB0eXBlZGVmIGZvciB0aGUgTWluR1cgY29tcGls ZXIKKyAgICAgICAgYmVjYXVzZSBzb21lIGZpbGVzIHRoYXQgaW5jbHVkZSBUcmFuc2Zvcm1hdGlv bk1hdHJpeC5oIChzdWNoIGFzCisgICAgICAgIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh ZGllbnQuaCkgZG8gbm90IGluY2x1ZGUgPHdpbmRvd3MuaD4uIEhlbmNlLAorICAgICAgICB0aGV5 IGNhbm5vdCByZXNvbHZlIFhGT1JNIGluIFRyYW5zZm9ybWF0aW9uTWF0cml4OjpvcGVyYXRvciBY Rk9STSgpLgorICAgICAgICBUaGVyZWZvcmUsIHdlIG5lZWQgdG8gaW5jbHVkZSA8d2luZG93cy5o Pi4KKworICAgICAgICBObyBmdW5jdGlvbmFsaXR5IHdhcyBjaGFuZ2VkLiBTbywgbm8gbmV3IHRl c3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1h dGlvbk1hdHJpeC5oOgorCiAyMDEwLTAxLTE4ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1h dGlvbk1hdHJpeC5oCShyZXZpc2lvbiA1MzQxOSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oCSh3b3JraW5nIGNvcHkpCkBAIC00 NCw3ICs0NCw3IEBACiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKFdJTikgfHwgKFBMQVRGT1JNKFFU KSAmJiBPUyhXSU5ET1dTKSkgfHwgKFBMQVRGT1JNKFdYKSAmJiBPUyhXSU5ET1dTKSkKLXR5cGVk ZWYgc3RydWN0IHRhZ1hGT1JNIFhGT1JNOworI2luY2x1ZGUgPHdpbmRvd3MuaD4gLy8gZm9yIFhG T1JNLgogI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK 46929 2010-01-19 11:27:28 -0800 2010-01-19 13:05:18 -0800 Patch Bug33822_1.patch text/plain 1433 dbates SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzQ0NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDEtMTggIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJraXQu b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzgyMgorCisgICAgICAgIFJF R1JFU1NJT04ocjUzMjczKTogRml4ZXMgcmVkZWZpbml0aW9uIG9mIFhGT1JNIGVycm9yIHdoZW4g YnVpbGRpbmcKKyAgICAgICAgV2ViS2l0IHVzaW5nIFF0IFdpbmRvd3Mgd2l0aCB0aGUgTWluR1cg Y29tcGlsZXIuCisgCisgICAgICAgIE5vdGUsIE1pbkdXIGhhcyBhIHNsaWdodGx5IGRpZmZlcmVu dCBkZWNsYXJhdGlvbiBvZiB0aGUgc3RydWN0IFhGT1JNCisgICAgICAgIGZyb20gdGhhdCBpbiB0 aGUgTWljcm9zb2Z0IFNESy4gU28sIHdlIG5lZWQgdG8gc3Vic3RpdHV0ZSBhbiBhbHRlcm5hdGl2 ZQorICAgICAgICB0eXBlZGVmIGZvciBYRk9STSB3aGVuIGNvbXBpbGluZyB3aXRoIE1pbkdXLgor CisgICAgICAgIE5vIGZ1bmN0aW9uYWxpdHkgd2FzIGNoYW5nZWQuIFNvLCBubyBuZXcgdGVzdHMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90cmFuc2Zvcm1zL1RyYW5zZm9ybWF0aW9u TWF0cml4Lmg6CisKIDIwMTAtMDEtMTggIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90cmFuc2Zvcm1zL1RyYW5zZm9ybWF0aW9uTWF0cml4LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90cmFuc2Zvcm1zL1RyYW5zZm9ybWF0aW9u TWF0cml4LmgJKHJldmlzaW9uIDUzNDE5KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 cmFuc2Zvcm1zL1RyYW5zZm9ybWF0aW9uTWF0cml4LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDgg KzQ0LDEyIEBACiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKFdJTikgfHwgKFBMQVRGT1JNKFFUKSAm JiBPUyhXSU5ET1dTKSkgfHwgKFBMQVRGT1JNKFdYKSAmJiBPUyhXSU5ET1dTKSkKKyNpZiBDT01Q SUxFUihNSU5HVykKK3R5cGVkZWYgc3RydWN0IF9YRk9STSBYRk9STTsKKyNlbHNlCiB0eXBlZGVm IHN0cnVjdCB0YWdYRk9STSBYRk9STTsKICNlbmRpZgorI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAo=