claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
WIndows XP
2009-12-31 22:21:11 -05:00
parent 0fa86bcc50
commit 309bff3441
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/driver/MSWindows/win32.c
View File

@@ -221,11 +221,11 @@ str_to_access_mode_win32(const char *psz_access_mode)
return _AM_IOCTL; return _AM_IOCTL;
else if (!strcmp(psz_access_mode, "ASPI")) { else if (!strcmp(psz_access_mode, "ASPI")) {
#ifdef _XBOX #ifdef _XBOX
return _AM_ASPI;
#else
cdio_warn ("XBOX doesn't support access type: %s. Default used instead.", cdio_warn ("XBOX doesn't support access type: %s. Default used instead.",
psz_access_mode); psz_access_mode);
return default_access_mode; return default_access_mode;
#else
return _AM_ASPI;
#endif #endif
} else { } else {
cdio_warn ("unknown access type: %s. Default used instead.", cdio_warn ("unknown access type: %s. Default used instead.",

2
lib/driver/gnu_linux.c
View File

@@ -1552,6 +1552,7 @@ close_tray_linux (const char *psz_device)
#endif /*HAVE_LINUX_CDROM*/ #endif /*HAVE_LINUX_CDROM*/
} }
#ifdef HAVE_LINUX_CDROM
/*! /*!
Produce a text composed from the system SCSI address tuple according to 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 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); env->gen.scsi_tuple = strdup(tuple);
return 1; return 1;
} }
#endif
/*! /*!
Initialization routine. This is the only thing that doesn't Initialization routine. This is the only thing that doesn't