[Bug 41492] New: Failure to compile: redefinition of typedef ‘EVENT_FILTER_DESCRIPTOR’

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

Bug ID: 41492
           Summary: Failure to compile: redefinition of typedef
                    ‘EVENT_FILTER_DESCRIPTOR’
           Product: Wine
           Version: unspecified
          Hardware: x86
                OS: Linux
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: advapi32
          Assignee: [e-mail]
          Reporter: [e-mail]
      Distribution: ---

After this commit:

bacc68822aec1a025bc0e8c7aab7b75061e1c8e6 is the first bad commit
commit bacc68822aec1a025bc0e8c7aab7b75061e1c8e6
Author: Hans Leidekker 
Date:   Tue Oct 4 13:28:32 2016 +0200

advapi32: Add a stub implementation of EnableTraceEx2.

Signed-off-by: Hans Leidekker 
    Signed-off-by: Alexandre Julliard

:040000 040000 7be41c4ce51a93c12620a211e90ff5bf47bf1a4a
6aaa457abe3c4620e3bd42f9b12d9f8ddf3bf2f0 M      dlls
:040000 040000 45433006cb8e07d5b2cdb6a0580e4be5eb2e57ce
cb7fcf39a66e6e059da998bda873b1afb852233e M      include

I get the following compilation error:

/usr/lib/ccache/gcc-4.5 -c -o eventlog.o eventlog.c -I. -I../../include
-D__WINESRC__ -D_ADVAPI32_ -D_REENTRANT -fPIC -Wall \
  -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body
-Wignored-qualifiers \
  -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith
-Wlogical-op -gdwarf-2 \
  -gstrict-dwarf -fno-omit-frame-pointer -g -I/opt/Xorg-7.7/include 
In file included from eventlog.c:31:0:
../../include/evntprov.h:58:3: error: redefinition of typedef
‘EVENT_FILTER_DESCRIPTOR’
../../include/evntrace.h:251:41: note: previous declaration of
‘EVENT_FILTER_DESCRIPTOR’ was here
../../include/evntprov.h:58:29: error: redefinition of typedef
‘PEVENT_FILTER_DESCRIPTOR’
../../include/evntrace.h:251:67: note: previous declaration of
‘PEVENT_FILTER_DESCRIPTOR’ was here
make[1]: *** [eventlog.o] Error 1

[Bug 41492] Failure to compile:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘EVENT_FILTER_DESCRIPTOR’

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

Ruslan Kabatsayev  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
    Regression SHA1|                            |bacc68822aec1a025bc0e8c7aab
                   |                            |7b75061e1c8e6
                 CC|                            |[e-mail]

[Bug 41492] Failure to compile:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘EVENT_FILTER_DESCRIPTOR’

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

Sebastian Lackner  changed:

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

--- Comment #1 from Sebastian Lackner  ---
I assume this was fixed with
http://source.winehq.org/git/wine.git/commit/c185757993095382cc7580ac78d27f0....
Could you please test and update the bug status if it works for you?

[Bug 41492] Failure to compile:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘EVENT_FILTER_DESCRIPTOR’

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

--- Comment #2 from Ruslan Kabatsayev  ---
(In reply to Sebastian Lackner from comment #1)
> I assume this was fixed with
> http://source.winehq.org/git/wine.git/commit/
> c185757993095382cc7580ac78d27f08c523e9df. Could you please test and update
> the bug status if it works for you?

With current git one instance of this error still remains:

In file included from eventlog.c:31:0:
../../include/evntprov.h:58:29: error: redefinition of typedef
‘PEVENT_FILTER_DESCRIPTOR’
../../include/evntrace.h:251:42: note: previous declaration of
‘PEVENT_FILTER_DESCRIPTOR’ was here

I've tried doing `git clean -xdf` before recompiling, with the same results.

[Bug 41492] Failure to compile:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘EVENT_FILTER_DESCRIPTOR’

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

--- Comment #3 from Hans Leidekker  ---
Created attachment 55877
  --> https://bugs.winehq.org/attachment.cgi?id=55877
patch

Can you try this?

[Bug 41492] Failure to compile:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘EVENT_FILTER_DESCRIPTOR’

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

--- Comment #4 from Ruslan Kabatsayev  ---
(In reply to Hans Leidekker from comment #3)
> Created attachment 55877 [details]
> patch
>
> Can you try this?

Yes, now it compiles fine.

[Bug 41492] Failure to compile:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘EVENT_FILTER_DESCRIPTOR’

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

Nathan  changed:

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

--- Comment #5 from Nathan  ---
I had a very similar error when compiling.
The patch allows compilation to complete. Thanks.

[Bug 41492] Failure to compile:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘EVENT_FILTER_DESCRIPTOR’

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

--- Comment #6 from Sebastian Lackner  ---
(In reply to Hans Leidekker from comment #3)
> Created attachment 55877 [details]
> patch
>
> Can you try this?

The patch fixes the issue, but you can get rid of the unnecessary "struct
_EVENT_FILTER_DESCRIPTOR;". Without typedef it is no longer necessary.

[Bug 41492] Failure to compile:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘EVENT_FILTER_DESCRIPTOR’

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

Hans Leidekker  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
      Fixed by SHA1|                            |0bf8feb6fb6cb6e6c7360f39400
                   |                            |f46ef119c2b53
             Status|UNCONFIRMED                 |RESOLVED

--- Comment #7 from Hans Leidekker  ---
Fixed with 0bf8feb6fb6cb6e6c7360f39400f46ef119c2b53.

[Bug 41492] Failure to compile:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘EVENT_FILTER_DESCRIPTOR’

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

Alexandre Julliard  changed:

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

--- Comment #8 from Alexandre Julliard  ---
Closing bugs fixed in 1.9.22.