http://bugs.winehq.org/show_bug.cgi?id=16662
Summary: build broken in dlls/ntdll/cdrom.c on OpenBSD 4.4 Product: Wine Version: 1.1.11 Platform: PC OS/Version: OpenBSD Status: NEW Keywords: patch, source Severity: major Priority: P2 Component: build-env AssignedTo: wine-bugs@winehq.org ReportedBy: austinenglish@gmail.com
gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_NTSYSTEM_ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wwrite-strings -Wpointer-arith -I/usr/local/include -g -O2 -o cdrom.o cdrom.c cdrom.c: In function `DVD_ReadStructure': cdrom.c:1942: error: syntax error before "s" cdrom.c:1950: error: `s' undeclared (first use in this function) cdrom.c:1950: error: (Each undeclared identifier is reported only once cdrom.c:1950: error: for each function it appears in.) *** Error code 1
Patch below fixes it. Not submitted yet, need to investigate more first.
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 998b2dc..72b940e 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1938,7 +1938,9 @@ static NTSTATUS DVD_GetRegion(int dev, PDVD_REGION region) */ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, PDVD_LAYER_DESCRIPTOR layer) { -#ifdef DVD_READ_STRUCT +#if defined(DVD_READ_STRUCT) && defined(__OpenBSD__) + union dvd_struct s; +#elif defined(DVD_READ_STRUCT) dvd_struct s;
if (structure->BlockByteOffset.u.HighPart || structure->BlockByteOffset.u.LowPart)
http://bugs.winehq.org/show_bug.cgi?id=16662
--- Comment #1 from Austin English austinenglish@gmail.com 2009-03-29 21:00:01 --- Still present. Sent in patch: http://www.winehq.org/pipermail/wine-patches/2009-March/071296.html
http://bugs.winehq.org/show_bug.cgi?id=16662
Austin English austinenglish@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Severity|major |blocker
http://bugs.winehq.org/show_bug.cgi?id=16662
--- Comment #2 from Austin English austinenglish@gmail.com 2009-03-31 01:16:50 --- Created an attachment (id=20222) --> (http://bugs.winehq.org/attachment.cgi?id=20222) patch
Attaching patch here so it's not lost.
http://bugs.winehq.org/show_bug.cgi?id=16662
--- Comment #3 from Austin English austinenglish@gmail.com 2009-03-31 20:50:30 --- Created an attachment (id=20248) --> (http://bugs.winehq.org/attachment.cgi?id=20248) define a union
Works on OpenBSD and linux, haven't tested others...
http://bugs.winehq.org/show_bug.cgi?id=16662
Austin English austinenglish@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED
--- Comment #4 from Austin English austinenglish@gmail.com 2009-04-02 11:09:50 --- Fixed by c5dadf4739ed92d4839029078e0ef2c12d7e81b7.
http://bugs.winehq.org/show_bug.cgi?id=16662
Alexandre Julliard julliard@winehq.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |CLOSED
--- Comment #5 from Alexandre Julliard julliard@winehq.org 2009-04-10 11:21:01 --- Closing bugs fixed in 1.1.19.