Last change to gnu_linux.c broke things on non GNU/Linux

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.", 

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