[Bug 42835] New: redefinition of typedef 'WSD*'

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

Bug ID: 42835
           Summary: redefinition of typedef 'WSD*'
           Product: Wine
           Version: 2.6
          Hardware: x86
                OS: Linux
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: -unknown
          Assignee: [e-mail]
          Reporter: [e-mail]
      Distribution: ---

Created attachment 57929
  --> https://bugs.winehq.org/attachment.cgi?id=57929
log.txt

puppylinux 431

# gcc --version
gcc (GCC) 4.2.2

kernel version number
# uname -r
2.6.30.5

# ldd --version
ldd (GNU libc) 2.6.1

Applied patch from https://bugs.winehq.org/show_bug.cgi?id=42478#c2
before configure.

Compiling wine-2.6 fails with errors.

[Bug 42835] redefinition of typedef 'WSD*'

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

--- Comment #1 from Nathan  ---
Created attachment 57935
  --> https://bugs.winehq.org/attachment.cgi?id=57935
log_2017Apr18

racy puppy 5.5

# gcc --version
gcc (GCC) 4.3.4

# uname -r
3.0.66

# ldd --version
ldd (GNU libc) 2.10.1

Compiling wine-2.6 fails with errors.

[Bug 42835] redefinition of typedef 'WSD*'

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

Ruslan Kabatsayev  changed:

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

--- Comment #2 from Ruslan Kabatsayev  ---
Confirming. It's a regresssion:

ab326fe56f91d8ce8fd42cea174b213743b41cb9 is the first bad commit
commit ab326fe56f91d8ce8fd42cea174b213743b41cb9
Author: Owen Rudge 
Date:   Thu Apr 6 22:19:39 2017 +0100

wsdapi: Add stub implementation of IWSDiscoveryPublisher.

Signed-off-by: Owen Rudge 
    Signed-off-by: Alexandre Julliard

:040000 040000 d540aa3cf6d632315ab1dbdfbeb7663ebc2a97b0
31eb1754dac669ffa652851db95a3010fbbbc6c0 M      dlls

[Bug 42835] redefinition of typedef 'WSD*'

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

Ruslan Kabatsayev  changed:

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

[Bug 42835] redefinition of typedef 'WSD*'

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

--- Comment #3 from Owen Rudge  ---
I'll look into this tonight.

[Bug 42835] redefinition of typedef 'WSD*'

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

--- Comment #4 from Owen Rudge  ---
This bug should be fixed with the following patch:

https://source.winehq.org/patches/data/132823

Apologies, it didn't show up using my version of gcc (4.9.x).

[Bug 42835] redefinition of typedef 'WSD*'

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

--- Comment #5 from Ruslan Kabatsayev  ---
(In reply to Owen Rudge from comment #4)
> This bug should be fixed with the following patch:
>
> https://source.winehq.org/patches/data/132823

I still get this after the patch:

In file included from ../../include/wsdapi.h:24:0,
                 from discovery.c:31:
../../include/wsdxmldom.h:22:29: error: redefinition of typedef ‘WSDXML_TYPE’
../../include/wsdxml.h:39:29: note: previous declaration of ‘WSDXML_TYPE’ was
here
../../include/wsdxmldom.h:23:34: error: redefinition of typedef
‘WSDXML_NAMESPACE’
../../include/wsdxml.h:37:34: note: previous declaration of ‘WSDXML_NAMESPACE’
was here
../../include/wsdxmldom.h:24:29: error: redefinition of typedef ‘WSDXML_NAME’
../../include/wsdxml.h:38:29: note: previous declaration of ‘WSDXML_NAME’ was
here
../../include/wsdxmldom.h:28:32: error: redefinition of typedef
‘WSDXML_ELEMENT’
../../include/wsdxml.h:40:32: note: previous declaration of ‘WSDXML_ELEMENT’
was here
make[1]: *** [discovery.o] Error 1

[Bug 42835] redefinition of typedef 'WSD*'

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

--- Comment #6 from Owen Rudge  ---
https://source.winehq.org/patches/data/132856 should fix that, tested against
gcc 4.4.7. (It appears the typedef redefinition is valid in C11, which newer
versions of gcc default to, and this also matches what the Platform SDK does.)

[Bug 42835] redefinition of typedef 'WSD*'

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

--- Comment #7 from Ruslan Kabatsayev  ---
(In reply to Owen Rudge from comment #6)
> https://source.winehq.org/patches/data/132856 should fix that, tested
> against gcc 4.4.7.

Yes, this does fix compilation for me now (with gcc 4.5). Thanks.

[Bug 42835] redefinition of typedef 'WSD*'

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

--- Comment #8 from Nathan  ---
I get 'wine build complete', after applying three patches from:
https://bugs.winehq.org/show_bug.cgi?id=42478#c2
https://bugs.winehq.org/show_bug.cgi?id=42835#c4
https://bugs.winehq.org/show_bug.cgi?id=42835#c6

Thank you.

# gcc --version
gcc (GCC) 4.2.2

[Bug 42835] redefinition of typedef 'WSD*'

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

Gijs Vermeulen  changed:

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

--- Comment #9 from Gijs Vermeulen  ---
(In reply to Ruslan Kabatsayev from comment #7)
> (In reply to Owen Rudge from comment #6)
> > https://source.winehq.org/patches/data/132856 should fix that, tested
> > against gcc 4.4.7.
>
> Yes, this does fix compilation for me now (with gcc 4.5). Thanks.

Could you mark this as fixed and fill the fixed sha1 with
b7279badfa1583d9bb82bd951b0b621846cc38ea ?

[Bug 42835] redefinition of typedef 'WSD*'

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

--- Comment #10 from Gijs Vermeulen  ---
(In reply to Nathan from comment #8)
> I get 'wine build complete', after applying three patches from:
> https://bugs.winehq.org/show_bug.cgi?id=42478#c2
> https://bugs.winehq.org/show_bug.cgi?id=42835#c4
> https://bugs.winehq.org/show_bug.cgi?id=42835#c6
>
> Thank you.
>
> # gcc --version
> gcc (GCC) 4.2.2

See the comment above (quoted the wrong person).

[Bug 42835] redefinition of typedef 'WSD*'

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

--- Comment #11 from Nathan  ---
Wine-2.7

I receive 'wine build complete' after applying one patch:
https://bugs.winehq.org/show_bug.cgi?id=42478#c2

Wine source has the two patches: 
https://bugs.winehq.org/show_bug.cgi?id=42835#c4
https://bugs.winehq.org/show_bug.cgi?id=42835#c6

... so no need to apply them in this compile.

Thank you.

[Bug 42835] redefinition of typedef 'WSD*'

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

--- Comment #12 from Gijs Vermeulen  ---
(In reply to Nathan from comment #11)
> Wine-2.7
>
> I receive 'wine build complete' after applying one patch:
> https://bugs.winehq.org/show_bug.cgi?id=42478#c2
>
> Wine source has the two patches: 
> https://bugs.winehq.org/show_bug.cgi?id=42835#c4
> https://bugs.winehq.org/show_bug.cgi?id=42835#c6
>
> ... so no need to apply them in this compile.
>
> Thank you.

Then please mark this bug as fixed and fill in the fixed by sha-1 field with
the hash I mentioned above.

[Bug 42835] redefinition of typedef 'WSD*'

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

Nathan  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
      Fixed by SHA1|                            |b7279badfa1583d9bb82bd951b0
                   |                            |b621846cc38ea
         Resolution|---                         |FIXED
             Status|UNCONFIRMED                 |RESOLVED

--- Comment #13 from Nathan  ---
Marked as fixed by SHA-1 b7279badfa1583d9bb82bd951b0b621846cc38ea

[Bug 42835] redefinition of typedef 'WSD*'

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

Alexandre Julliard  changed:

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

--- Comment #14 from Alexandre Julliard  ---
Closing bugs fixed in 2.8.