ntdll/cdrom.c NetBSD compile fix

Bang Jun-Young junyoung at mogua.com
Thu Jan 17 15:04:44 CST 2002


	* dlls/ntdll/cdrom.c:
	Bang Jun-Young <junyoung at mogua.com>
	Fix NetBSD compile errors; CDIOCREADAUDIO is not available
	on NetBSD.

-- 
Bang Jun-Young <junyoung at mogua.com>

-------------- next part --------------
Index: cdrom.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
retrieving revision 1.2
diff -u -r1.2 cdrom.c
--- cdrom.c	2002/01/14 18:34:34	1.2
+++ cdrom.c	2002/01/17 18:52:28
@@ -765,9 +765,7 @@
             break;
         }
     }
-    *sz = sectSize * raw->SectorCount;
-    ret = CDROM_GetStatusCode(io);
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__)
     {
         struct ioc_read_audio   ira;
 
@@ -791,9 +789,24 @@
             break;
         }
     }
+#elif defined(__NetBSD__)
+    {
+        switch (raw->TrackMode)
+        {
+        case YellowMode2:
+            FIXME("YellowMode2: NIY\n");
+            return ret;
+        case XAForm2:
+            FIXME("XAForm2: NIY\n");
+            return ret;
+        case CDDA:
+	    FIXME("CDDA: NIY\n");
+	    return ret;
+	}
+    }
+#endif
     *sz = sectSize * raw->SectorCount;
     ret = CDROM_GetStatusCode(io);
-#endif
     return ret;
 }
 


More information about the wine-patches mailing list