[Bug 43777] New:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘REFERENCE_TIME’ ( gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43777

Bug ID: 43777
           Summary: redefinition of typedef ‘REFERENCE_TIME’ (gcc-4.2)
           Product: Wine
           Version: unspecified
          Hardware: x86-64
                OS: Mac OS X
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: -unknown
          Assignee: [e-mail]
          Reporter: [e-mail]
                CC: [e-mail]
   Regression SHA1: 44cb0afb2571984bda8ca1fa084a50c1fc04ac71

Current wine-git doesn't compile with gcc-4.2 anymore.

In file included from evr.c:31:
../../include/dxva2api.h:125: error: redefinition of typedef ‘REFERENCE_TIME’
../../include/strmif.h:730: error: previous declaration of ‘REFERENCE_TIME’ was
here
make[1]: *** [evr.o] Error 1
make[1]: *** Waiting for unfinished jobs....

Bisected to:

author    Fabian Maurer     
    Wed, 20 Sep 2017 12:03:38 +0000 (14:03 +0200)
commit    44cb0afb2571984bda8ca1fa084a50c1fc04ac71

evr: Add EnhancedVideoRenderer coclass.

Signed-off-by: Fabian Maurer 
Signed-off-by: Alexandre Julliard

[Bug 43777]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘REFERENCE_TIME’ ( gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43777

Gijs Vermeulen  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
           Keywords|                            |regression

[Bug 43777]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘REFERENCE_TIME’ ( gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43777

--- Comment #1 from Fabian Maurer  ---
Created attachment 59291
  --> https://bugs.winehq.org/attachment.cgi?id=59291
Don't redefine REFERENCE_TIME

Can't test the issue since I don't use such an old gcc. Does the attached patch
help?

[Bug 43777]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘REFERENCE_TIME’ ( gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43777

--- Comment #2 from Gijs Vermeulen  ---
(In reply to Fabian Maurer from comment #1)
> Created attachment 59291 [details]
> Don't redefine REFERENCE_TIME
>
> Can't test the issue since I don't use such an old gcc. Does the attached
> patch help?

Sorry for the late reply.
The patch unfortunately does not help, same error.

[Bug 43777]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘REFERENCE_TIME’ ( gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43777

--- Comment #3 from Gijs Vermeulen  ---
Created attachment 59365
  --> https://bugs.winehq.org/attachment.cgi?id=59365
Patch to fix the issue

(In reply to Fabian Maurer from comment #1)
> Created attachment 59291 [details]
> Don't redefine REFERENCE_TIME
>
> Can't test the issue since I don't use such an old gcc. Does the attached
> patch help?

This version of your patch works.
You have to put the ifndef, define and endif in a cpp_quote.

[Bug 43777]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘REFERENCE_TIME’ ( gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43777

--- Comment #4 from Fabian Maurer  ---
Ah yes, I just noticed and wanted to submit an updated patch, but you were
faster. Sorry, my bad.

But since you reported it fixes the issue, I sent it in here:
https://source.winehq.org/patches/data/137473

[Bug 43777]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘REFERENCE_TIME’ ( gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43777

Nathan  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #5 from Nathan  ---
(In reply to Fabian Maurer from comment #4)
Thank you both for the patch.
Wine build completes now.

[Bug 43777]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘REFERENCE_TIME’ ( gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43777

Fabian Maurer  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
      Fixed by SHA1|                            |84d2d7818bc84ea90303d8b047f
                   |                            |3e4e833e6e316
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|---                         |FIXED

--- Comment #6 from Fabian Maurer  ---
Fixed as of 84d2d7818bc84ea90303d8b047f3e4e833e6e316.

[Bug 43777]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘REFERENCE_TIME’ ( gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43777

Alexandre Julliard  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #7 from Alexandre Julliard  ---
Closing bugs fixed in 2.19.