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

OSX fixes: test for stdbool.h, allow darwin10-12 and set DARWINT_10_OR_GREATER. Use generic CD-Text routines.

Browse Source
This commit is contained in:
R. Bernstein
2012-04-21 23:42:53 -04:00
parent a7bca58f7f
commit c7c422221e
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@@ -168,7 +168,7 @@ AC_DEFINE(LIBCDIO_CONFIG_H, 1,
dnl headers dnl headers
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS(errno.h fcntl.h glob.h limits.h pwd.h) AC_CHECK_HEADERS(errno.h fcntl.h glob.h limits.h pwd.h stdbool.h)
AC_CHECK_HEADERS(stdarg.h stdbool.h stdio.h sys/cdio.h sys/param.h \ AC_CHECK_HEADERS(stdarg.h stdbool.h stdio.h sys/cdio.h sys/param.h \
sys/time.h sys/timeb.h sys/utsname.h) sys/time.h sys/timeb.h sys/utsname.h)
@@ -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*|darwin10*) darwin[6-9]|darwin1[0-2])
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
@@ -346,15 +346,11 @@ case $host_os in
fi fi
case $host_os in case $host_os in
darwin10*) darwin1[0-2])
darwin_10=1 AC_DEFINE([DARWIN_10_OR_GREATER], 1,
;; [Define 1 if you have Darwin OS X 10 or greater])
*)
darwin_10=0
;; ;;
esac 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"

8
lib/driver/osx.c
View File

@@ -32,7 +32,9 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: osx.c,v 1.14 2008/10/17 11:58:52 rocky Exp $"; #ifdef HAVE_STDBOOL_H
# include <stdbool.h>
#endif
#include <cdio/logging.h> #include <cdio/logging.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -1898,8 +1900,8 @@ cdio_open_osx (const char *psz_orig_source)
.eject_media = _eject_media_osx, .eject_media = _eject_media_osx,
.free = _free_osx, .free = _free_osx,
.get_arg = _get_arg_osx, .get_arg = _get_arg_osx,
.get_cdtext = NULL, .get_cdtext = get_cdtext_generic,
.get_cdtext_raw = NULL, .get_cdtext_raw = read_cdtext_generic,
.get_default_device = cdio_get_default_device_osx, .get_default_device = cdio_get_default_device_osx,
.get_devices = cdio_get_devices_osx, .get_devices = cdio_get_devices_osx,
.get_disc_last_lsn = get_disc_last_lsn_osx, .get_disc_last_lsn = get_disc_last_lsn_osx,