From 16f2cc0b1704a138ed799ab45eec8df566eb00e1 Mon Sep 17 00:00:00 2001
From: rocky <rocky@gnu.org>
Date: Sat, 28 Apr 2012 18:51:59 -0400
Subject: [PATCH] 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

---
 configure.ac     | 6 ------
 lib/driver/osx.c | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index aa8d7ab8..9032bf89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,12 +345,6 @@ case $host_os in
 	     DARWIN_PKG_LIB_HACK="$DARWIN_PKG_LIB_HACK -Wl,-framework,DiskArbitration"
 	 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)
 	 LIBCDIO_LIBS="$LIBCDIO_LIBS $DARWIN_PKG_LIB_HACK"
          cd_drivers="${cd_drivers}, Darwin"
diff --git a/lib/driver/osx.c b/lib/driver/osx.c
index bf6ebdf8..9d52928a 100644
--- a/lib/driver/osx.c
+++ b/lib/driver/osx.c
@@ -70,7 +70,7 @@ typedef enum {
 
 #include <mach/mach.h>
 #include <Carbon/Carbon.h>
-#ifdef DARWIN_10_OR_GREATER
+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1040
 # include <IOKit/scsi/SCSITaskLib.h>
 #else
 # include <IOKit/scsi-commands/SCSITaskLib.h>
@@ -92,7 +92,7 @@ typedef enum {
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/IOBSD.h>
-#ifdef DARWIN_10_OR_GREATER
+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1040
 # include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
 #else
 # include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h>