Actually, this comment only regenerated headers, which got broken by this:
http://sourceforge.net/p/mingw-w64/mingw-w64/ci/b638e703a2bfbc19c61eaf293a94a1059f657075/
Anyway, the attached patch fixes the problem.
Thanks,
Jacek
On 12/16/14 14:16, NAKAI Yuta wrote:
> The problem is introduced at this change
> (http://sourceforge.net/p/mingw-w64/mingw-w64/ci/d008dc5b65a93ec20734540cf7e45ad1e0692ee1/tree//mingw-w64-headers/include/mfobjects.h?diff=3418d798c1d9e96e3bb29901a28820efc7331608).
> Because #if 0 was deleted (accidentally?), the redefinition occurred.
>
> ________________________________
>> Date: Tue, 16 Dec 2014 14:44:08 +0400
>> From: alex...@gmail.com
>> To: Mingw-w64-public@lists.sourceforge.net
>> Subject: [Mingw-w64-public] Trunk build fail
>>
>> Recent trunk version of mingw-w64 runtime fail to build during last
>> changes to huge headers:
>> http://pastebin.com/XZ30gHtF
>>
>> Regards,
>> Alexey.
>>
>> ------------------------------------------------------------------------------
>>
>> Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from
>> Actuate! Instantly Supercharge Your Business Reports and Dashboards
>> with Interactivity, Sharing, Native Excel Exports, App Integration &
>> more Get technology previously reserved for billion-dollar
>> corporations, FREE
>> http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
>> _______________________________________________ Mingw-w64-public
>> mailing list Mingw-w64-public@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
>
> ------------------------------------------------------------------------------
> Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> from Actuate! Instantly Supercharge Your Business Reports and Dashboards
> with Interactivity, Sharing, Native Excel Exports, App Integration & more
> Get technology previously reserved for billion-dollar corporations, FREE
> http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
> _______________________________________________
> Mingw-w64-public mailing list
> Mingw-w64-public@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
commit 2554ceeeecb6e9b048f53beca04d24a8aac1f0f1
Author: Jacek Caban <ja...@codeweavers.com>
Date: Tue Dec 16 14:49:22 2014 +0100
mmreg.h: Fixed a typo.
diff --git a/mingw-w64-headers/include/mfobjects.h
b/mingw-w64-headers/include/mfobjects.h
index c1c5d1e..fabd2bb 100644
--- a/mingw-w64-headers/include/mfobjects.h
+++ b/mingw-w64-headers/include/mfobjects.h
@@ -158,6 +158,7 @@ extern "C" {
typedef ULONGLONG QWORD;
#include <mmreg.h>
+#if 0
typedef struct tWAVEFORMATEX {
WORD wFormatTag;
WORD nChannels;
diff --git a/mingw-w64-headers/include/mmreg.h
b/mingw-w64-headers/include/mmreg.h
index ecc186b..953f78b 100644
--- a/mingw-w64-headers/include/mmreg.h
+++ b/mingw-w64-headers/include/mmreg.h
@@ -2725,7 +2725,7 @@ extern "C" {
#endif
#endif
-#else /* defined (__WIDL__)
+#else /* defined (__WIDL__) */
cpp_quote("#if 0")
/* FIXME: #pragma pack(push, 1) */
typedef struct tWAVEFORMATEX {
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
