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

Do not need DARWIN_10_OR_GREATER but can use __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ instead courtesy Natalia Portillo. Savannah Bug #36330 https://savannah.gnu.org/bugs/?36330

Browse Source
This commit is contained in:
rocky
2012-04-28 18:51:59 -04:00
parent e71066d5d9
commit 16f2cc0b17
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -345,12 +345,6 @@ 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
darwin1[[0-2]].*)
AC_DEFINE([DARWIN_10_OR_GREATER], 1,
[Define 1 if you have Darwin OS X 10 or greater])
;;
esac
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"

4
lib/driver/osx.c
View File

@@ -70,7 +70,7 @@ typedef enum {
#include <mach/mach.h> #include <mach/mach.h>
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#ifdef DARWIN_10_OR_GREATER #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1040
# include <IOKit/scsi/SCSITaskLib.h> # include <IOKit/scsi/SCSITaskLib.h>
#else #else
# include <IOKit/scsi-commands/SCSITaskLib.h> # include <IOKit/scsi-commands/SCSITaskLib.h>
@@ -92,7 +92,7 @@ typedef enum {
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <IOKit/IOBSD.h> #include <IOKit/IOBSD.h>
#ifdef DARWIN_10_OR_GREATER #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1040
# include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> # include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
#else #else
# include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h> # include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h>