https://bugs.winehq.org/show_bug.cgi?id=49106
Bug ID: 49106 Summary: error: redefinition of typedef ‘UCHAR’ (plus PUCHAR’, ‘USHORT’, PUSHORT’, ‘ULONG’, and PULONG’) Product: Wine Version: 5.7 Hardware: x86 OS: Linux Status: UNCONFIRMED Severity: normal Priority: P2 Component: msvcrt Assignee: wine-bugs@winehq.org Reporter: version2013@protonmail.com Distribution: ---
in distro:
# uname --kernel-release 3.0.66
# gcc --version 4.3.4
# ldd --version 2.10.1
Compiling wine-5.7 fails with: error: redefinition of typedef ‘UCHAR’ error: redefinition of typedef ‘PUCHAR’ error: redefinition of typedef ‘USHORT’ error: redefinition of typedef ‘PUSHORT’ error: redefinition of typedef ‘ULONG’ error: redefinition of typedef ‘PULONG’
I imagine other bug [1] is still present, but this new bug stops compilation first.
[1] https://bugs.winehq.org/show_bug.cgi?id=47907
https://bugs.winehq.org/show_bug.cgi?id=49106
Nathan Bennett version2013@protonmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Keywords| |regression
https://bugs.winehq.org/show_bug.cgi?id=49106
--- Comment #1 from Nathan Bennett version2013@protonmail.com --- Created attachment 67078 --> https://bugs.winehq.org/attachment.cgi?id=67078 compilation error log
https://bugs.winehq.org/show_bug.cgi?id=49106
Nathan Bennett version2013@protonmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Summary|error: redefinition of |error: redefinition of |typedef ‘UCHAR’ (plus |typedef ‘UCHAR’ (plus |PUCHAR’, ‘USHORT’, |'PUCHAR’, ‘USHORT’, |PUSHORT’, ‘ULONG’, and |'PUSHORT’, ‘ULONG’, and |PULONG’) |'PULONG’)
https://bugs.winehq.org/show_bug.cgi?id=49106
Nathan Bennett version2013@protonmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Regression SHA1| |cd1a09be73115aa9a12fc39c278 | |4d7e54003762f
--- Comment #2 from Nathan Bennett version2013@protonmail.com --- My bisect attempt:
# cd /opt # git clone git://source.winehq.org/git/wine.git wine-git/ # cd wine-git/ # git bisect start # git bisect good wine-5.6 # git bisect bad wine-5.7
# CC="gcc -m32" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --x-includes=/usr/X11R7/include --x-libraries=/usr/X11R7/lib --with-x --libdir=/usr/lib32 CFLAGS="-g -O0 -march=i486 -mtune=i686" --verbose && make # git bisect good
# CC="gcc -m32" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --x-includes=/usr/X11R7/include --x-libraries=/usr/X11R7/lib --with-x --libdir=/usr/lib32 CFLAGS="-g -O0 -march=i486 -mtune=i686" --verbose && make # git bisect good
# CC="gcc -m32" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --x-includes=/usr/X11R7/include --x-libraries=/usr/X11R7/lib --with-x --libdir=/usr/lib32 CFLAGS="-g -O0 -march=i486 -mtune=i686" --verbose && make # git bisect bad
# CC="gcc -m32" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --x-includes=/usr/X11R7/include --x-libraries=/usr/X11R7/lib --with-x --libdir=/usr/lib32 CFLAGS="-g -O0 -march=i486 -mtune=i686" --verbose && make # git bisect good
# CC="gcc -m32" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --x-includes=/usr/X11R7/include --x-libraries=/usr/X11R7/lib --with-x --libdir=/usr/lib32 CFLAGS="-g -O0 -march=i486 -mtune=i686" --verbose && make # git bisect good
# CC="gcc -m32" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --x-includes=/usr/X11R7/include --x-libraries=/usr/X11R7/lib --with-x --libdir=/usr/lib32 CFLAGS="-g -O0 -march=i486 -mtune=i686" --verbose && make # git bisect good
# CC="gcc -m32" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --x-includes=/usr/X11R7/include --x-libraries=/usr/X11R7/lib --with-x --libdir=/usr/lib32 CFLAGS="-g -O0 -march=i486 -mtune=i686" --verbose && make # git bisect good
# CC="gcc -m32" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --x-includes=/usr/X11R7/include --x-libraries=/usr/X11R7/lib --with-x --libdir=/usr/lib32 CFLAGS="-g -O0 -march=i486 -mtune=i686" --verbose && make # git bisect good
# CC="gcc -m32" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --x-includes=/usr/X11R7/include --x-libraries=/usr/X11R7/lib --with-x --libdir=/usr/lib32 CFLAGS="-g -O0 -march=i486 -mtune=i686" --verbose && make # git bisect good cd1a09be73115aa9a12fc39c2784d7e54003762f is the first bad commit commit cd1a09be73115aa9a12fc39c2784d7e54003762f Author: Zebediah Figura z.figura12@gmail.com Date: Wed Apr 22 21:07:18 2020 -0500
include: Define RTL_BALANCED_NODE.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
:040000 040000 c123af493a1864ea6752ad94da2909ced219922d 55afab6e0cac3b2dae54f4639cf10272f8f1606d M include #
https://bugs.winehq.org/show_bug.cgi?id=49106
Zebediah Figura z.figura12@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- CC| |z.figura12@gmail.com
--- Comment #3 from Zebediah Figura z.figura12@gmail.com --- We can probably fix this trivially by reordering files in msvcrt.
That said, I think it's also wrong that winternl.h includes ntdef.h, but it's probably not worth fixing.
https://bugs.winehq.org/show_bug.cgi?id=49106
--- Comment #4 from Zebediah Figura z.figura12@gmail.com --- Created attachment 67098 --> https://bugs.winehq.org/attachment.cgi?id=67098 swap include order
Is this sufficient to fix the error? I can't figure out how to force that warning on my newer compiler...
https://bugs.winehq.org/show_bug.cgi?id=49106
--- Comment #5 from Nathan Bennett version2013@protonmail.com --- Created attachment 67106 --> https://bugs.winehq.org/attachment.cgi?id=67106 log2.txt
compiling wine-5.7 still fails even after patch: https://bugs.winehq.org/attachment.cgi?id=67098
https://bugs.winehq.org/show_bug.cgi?id=49106
--- Comment #6 from Zebediah Figura z.figura12@gmail.com --- Created attachment 67107 --> https://bugs.winehq.org/attachment.cgi?id=67107 swap include order in crt_wmain.c
Thanks. Can you please try this additional patch?
https://bugs.winehq.org/show_bug.cgi?id=49106
--- Comment #7 from Nathan Bennett version2013@protonmail.com --- Created attachment 67110 --> https://bugs.winehq.org/attachment.cgi?id=67110 log3.txt
compiling wine-5.7 still fails even after both patches applied: https://bugs.winehq.org/attachment.cgi?id=67098 https://bugs.winehq.org/attachment.cgi?id=67107
https://bugs.winehq.org/show_bug.cgi?id=49106
--- Comment #8 from Zebediah Figura z.figura12@gmail.com --- Created attachment 67111 --> https://bugs.winehq.org/attachment.cgi?id=67111 swap include order in winecrt0
We seem to be making progress at least; can you add this one please?
https://bugs.winehq.org/show_bug.cgi?id=49106
--- Comment #9 from Nathan Bennett version2013@protonmail.com --- Created attachment 67112 --> https://bugs.winehq.org/attachment.cgi?id=67112 log4.txt
compiling wine-5.7 fails after three patches applied: https://bugs.winehq.org/attachment.cgi?id=67098 https://bugs.winehq.org/attachment.cgi?id=67107 https://bugs.winehq.org/attachment.cgi?id=67111
https://bugs.winehq.org/show_bug.cgi?id=49106
--- Comment #10 from Zebediah Figura z.figura12@gmail.com --- Should hopefully be fixed in a more complete way by https://source.winehq.org/git/wine.git/commitdiff/d442b41ec655b1f073f45ff165a717e4c99f5a62; please retest.
https://bugs.winehq.org/show_bug.cgi?id=49106
Alexandre Julliard julliard@winehq.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED Fixed by SHA1| |d442b41ec655b1f073f45ff165a | |717e4c99f5a62
--- Comment #11 from Alexandre Julliard julliard@winehq.org --- Hopefully fixed.
https://bugs.winehq.org/show_bug.cgi?id=49106
Alexandre Julliard julliard@winehq.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |CLOSED
--- Comment #12 from Alexandre Julliard julliard@winehq.org --- Closing bugs fixed in 6.0-rc2.
https://bugs.winehq.org/show_bug.cgi?id=49106
--- Comment #13 from Nathan Bennett version2013@protonmail.com --- compiling wine-6.0-rc2 fails to produce this bug.
Thank you for the fix.