From 309bff3441e0990bbb679bd59b2c6edde70b0f79 Mon Sep 17 00:00:00 2001
From: WIndows XP <rocky@gnu.org>
Date: Thu, 31 Dec 2009 22:21:11 -0500
Subject: [PATCH] Last change to gnu_linux.c broke things on non GNU/Linux

---
 lib/driver/MSWindows/win32.c | 4 ++--
 lib/driver/gnu_linux.c       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/driver/MSWindows/win32.c b/lib/driver/MSWindows/win32.c
index 3f982dce..26254c6c 100644
--- a/lib/driver/MSWindows/win32.c
+++ b/lib/driver/MSWindows/win32.c
@@ -221,11 +221,11 @@ str_to_access_mode_win32(const char *psz_access_mode)
     return _AM_IOCTL;
   else if (!strcmp(psz_access_mode, "ASPI")) {
 #ifdef _XBOX
-    return _AM_ASPI;
-#else 
     cdio_warn ("XBOX doesn't support access type: %s. Default used instead.", 
 	       psz_access_mode);
     return default_access_mode;
+#else 
+    return _AM_ASPI;
 #endif    
   } else {
     cdio_warn ("unknown access type: %s. Default used instead.", 
diff --git a/lib/driver/gnu_linux.c b/lib/driver/gnu_linux.c
index 765fdc0f..cf7d9fa0 100644
--- a/lib/driver/gnu_linux.c
+++ b/lib/driver/gnu_linux.c
@@ -1552,6 +1552,7 @@ close_tray_linux (const char *psz_device)
 #endif /*HAVE_LINUX_CDROM*/
 }
 
+#ifdef HAVE_LINUX_CDROM
 /*!
   Produce a text composed from the system SCSI address tuple according to
   habits of Linux 2.4 and 2.6 :  "Bus,Host,Channel,Target,Lun" and store
@@ -1622,6 +1623,7 @@ no_tuple:;
   env->gen.scsi_tuple = strdup(tuple);
   return 1; 
 }
+#endif
 
 /*!
   Initialization routine. This is the only thing that doesn't