[Bug 16662] New: build broken in dlls/ntdll/cdrom.c on OpenBSD 4.4

[wine-bugs at winehq.org]

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 at winehq.org
        ReportedBy: austinenglish at 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)


-- 
Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email
Do not reply to this email, post in Bugzilla using the
above URL to reply.
------- You are receiving this mail because: -------
You are watching all bug changes.