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

Possibly fixes OSX 10.6 where includes have moved around a bit.

Browse Source
This commit is contained in:
R. Bernstein
2012-04-10 03:29:32 -04:00
parent b052c43389
commit 844578d204
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -324,7 +324,7 @@ case $host_os in
## AC_DEFINE([HAVE_AIX_CDROM], [1], ## AC_DEFINE([HAVE_AIX_CDROM], [1],
## [Define 1 if you have AIX CD-ROM support]) ## [Define 1 if you have AIX CD-ROM support])
;; ;;
darwin6*|darwin7*|darwin8*|darwin9*) darwin6*|darwin7*|darwin8*|darwin9*|darwin10*)
AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h, AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h,
[have_iokit_h="yes"]) [have_iokit_h="yes"])
if test "x$have_iokit_h" = "xyes" ; then if test "x$have_iokit_h" = "xyes" ; then
@@ -345,6 +345,16 @@ case $host_os in
DARWIN_PKG_LIB_HACK="$DARWIN_PKG_LIB_HACK -Wl,-framework,DiskArbitration" DARWIN_PKG_LIB_HACK="$DARWIN_PKG_LIB_HACK -Wl,-framework,DiskArbitration"
fi fi
case $host_os in
darwin10*)
darwin_10=1
;;
*)
darwin_10=0
;;
esac
AC_DEFINE([DARWIN_10_OR_GREATER], [$darwin_10],
[Define 1 if you have Darwin OS X 10 or greater])
AC_SUBST(DARWIN_PKG_LIB_HACK) AC_SUBST(DARWIN_PKG_LIB_HACK)
LIBCDIO_LIBS="$LIBCDIO_LIBS $DARWIN_PKG_LIB_HACK" LIBCDIO_LIBS="$LIBCDIO_LIBS $DARWIN_PKG_LIB_HACK"
cd_drivers="${cd_drivers}, Darwin" cd_drivers="${cd_drivers}, Darwin"

13
lib/driver/osx.c
View File

@@ -69,7 +69,11 @@ typedef enum {
#include <mach/mach.h> #include <mach/mach.h>
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#include <IOKit/scsi-commands/SCSITaskLib.h> #ifdef DARWIN_10_OR_GREATER
# include <IOKit/scsi/SCSITaskLib.h>
#else
# include <IOKit/scsi-commands/SCSITaskLib.h>
#endif
#include <IOKit/IOCFPlugIn.h> #include <IOKit/IOCFPlugIn.h>
#include <mach/mach_error.h> #include <mach/mach_error.h>
@@ -83,12 +87,15 @@ typedef enum {
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <paths.h> #include <paths.h>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <IOKit/IOBSD.h> #include <IOKit/IOBSD.h>
#include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h> #ifdef DARWIN_10_OR_GREATER
# include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
#else
# include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h>
#endif
#include <IOKit/storage/IOCDTypes.h> #include <IOKit/storage/IOCDTypes.h>
#include <IOKit/storage/IODVDTypes.h> #include <IOKit/storage/IODVDTypes.h>
#include <IOKit/storage/IOMedia.h> #include <IOKit/storage/IOMedia.h>