[Bug 46892] New:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

Bug ID: 46892
           Summary: redefinition of typedef ‘UUID’
           Product: Wine
           Version: unspecified
          Hardware: x86
                OS: Linux
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: ntoskrnl
          Assignee: [e-mail]
          Reporter: [e-mail]
      Distribution: ---

in distro:
puppy431

# gcc --version
gcc (GCC) 4.2.2

# uname -r
2.6.30.5

# ldd --version
ldd (GNU libc) 2.6.1

Compiling Wine-4.4 fails.

[Bug 46892]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

--- Comment #1 from Nathan  ---
in distro:
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-4.4 fails.

[Bug 46892]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

--- Comment #2 from Nathan  ---
Created attachment 63968
  --> https://bugs.winehq.org/attachment.cgi?id=63968
compile error log

[Bug 46892]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

--- Comment #3 from Nathan  ---
Trying to bisect this new compile error results in the compile to fail with the
previous regression from:
https://bugs.winehq.org/show_bug.cgi?id=46680

Trying to revert commit d73a6bae08644f0e551fd16ac0ed543d1eb871e3 fails.

I am unsure how to bypass that commit in order to narrow down the new
regression.

[Bug 46892]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

--- Comment #4 from Nathan  ---
(In reply to Nathan from comment #3)
wine-4.0 compiled successfully.
Since previous regression happened in wine-4.1, causing wine compile to fail, I
am unsure, yet, where this new regression started, hence the 'Version' set to
'unspecified'.

Since that compile error (previous regression) happened during the first build
of the bisect, I tried patching that commit (after starting over with a fresh
wine-git download) after inputting the 'start good bad' commands rather than
before.

# cd /opt
# git clone git://source.winehq.org/git/wine.git wine-git/
# cd wine-git/
# git bisect start
# git bisect good wine-4.0
# git bisect bad wine-4.4

https://bugs.winehq.org/show_bug.cgi?id=46680#c12
create patch.diff file with contents from commit at:
https://source.winehq.org/git/wine.git/patch/994976dcb3f42a370f0419fbd3c3fe7...

move patch.diff file into /wine-git/

# git apply patch.diff

I will finish bisecting, but so far this is working.

[Bug 46892]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

Zhiyi Zhang  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]
    Regression SHA1|                            |948d39c52905c6927d67b5eefae
                   |                            |b4a8fab537db1

--- Comment #5 from Zhiyi Zhang  ---
Confirmed.

My bad. It's introduced by 948d39c52905c6927d67b5eefaeb4a8fab537db1. On
Windows, rpcde.h doesn't even exist, so without UUID_DEFINED macro, as in
original headers is fine. However on wine we need to take care of that because
"wine/svcctl.h" will eventually include a rpcde.h to redefine GUID to UUID .
Newer version of gcc seems able to handle this.

https://source.winehq.org/patches/data/161497 shoud fix this.

[Bug 46892]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

Zhiyi Zhang  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |NEW
     Ever confirmed|0                           |1

--- Comment #6 from Zhiyi Zhang  ---
Changing status

[Bug 46892]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

Nathan  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
            Version|unspecified                 |4.3

[Bug 46892]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

--- Comment #7 from Nathan  ---
(In reply to Zhiyi Zhang from comment #5)
With patch applied to wine-4.4,
'Wine build complete.'

Thank you.

[Bug 46892]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

Zhiyi Zhang  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
      Fixed by SHA1|                            |f76447bbab78008b556672aeac3
                   |                            |8995e101148c4
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED

--- Comment #8 from Zhiyi Zhang  ---
Closing

[Bug 46892]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘UUID’

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

Alexandre Julliard  changed:

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

--- Comment #9 from Alexandre Julliard  ---
Closing bugs fixed in 4.5.