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

Fix compile on OS X 10.3, should work on 10.2 and 10.3, still testing for 10.1, OS X Drivers still incomplete this is just to fix compiling.

Browse Source
This commit is contained in:
thesin
2004-05-31 15:21:48 +00:00
parent 6f78156edb
commit b0416a3eff
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -19,7 +19,7 @@ define(RELEASE_NUM, 69)
define(CDIO_VERSION_STR, 0.$1cvs) define(CDIO_VERSION_STR, 0.$1cvs)
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.79 2004/05/09 17:03:27 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.80 2004/05/31 15:21:48 thesin Exp $])dnl
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
AC_CONFIG_SRCDIR(src/cd-info.c) AC_CONFIG_SRCDIR(src/cd-info.c)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
@@ -230,13 +230,13 @@ AC_SUBST(LIBCDIO_LIBS)
AC_SUBST(LIBISO9660_LIBS) AC_SUBST(LIBISO9660_LIBS)
case $host_os in case $host_os in
darwin6*) darwin6*|darwin7*)
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
AC_DEFINE([HAVE_DARWIN_CDROM], [1], AC_DEFINE([HAVE_DARWIN_CDROM], [1],
[Define 1 if you have Darwin OS X-type CD-ROM support]) [Define 1 if you have Darwin OS X-type CD-ROM support])
LIBS="$LIBS -framework CoreFoundation -framework IOKit" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,IOKit"
cd_drivers="${cd_drivers}, Darwin" cd_drivers="${cd_drivers}, Darwin"
fi fi
;; ;;

12
lib/_cdio_osx.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_osx.c,v 1.23 2004/05/27 10:47:07 rocky Exp $ $Id: _cdio_osx.c,v 1.24 2004/05/31 15:21:48 thesin Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
from vcdimager code: from vcdimager code:
@@ -33,7 +33,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.23 2004/05/27 10:47:07 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.24 2004/05/31 15:21:48 thesin Exp $";
#include <cdio/sector.h> #include <cdio/sector.h>
#include <cdio/util.h> #include <cdio/util.h>
@@ -705,7 +705,7 @@ cdio_get_devices_osx(void)
return( nil ); return( nil );
} }
CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectable), CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectableKey),
kCFBooleanTrue ); kCFBooleanTrue );
kern_result = IOServiceGetMatchingServices( master_port, kern_result = IOServiceGetMatchingServices( master_port,
@@ -726,7 +726,7 @@ cdio_get_devices_osx(void)
do do
{ {
str_bsd_path = IORegistryEntryCreateCFProperty( next_media, str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
CFSTR( kIOBSDName ), CFSTR( kIOBSDNameKey ),
kCFAllocatorDefault, kCFAllocatorDefault,
0 ); 0 );
if( str_bsd_path == NULL ) if( str_bsd_path == NULL )
@@ -787,7 +787,7 @@ cdio_get_default_device_osx(void)
return( nil ); return( nil );
} }
CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectable), CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectableKey),
kCFBooleanTrue ); kCFBooleanTrue );
kern_result = IOServiceGetMatchingServices( master_port, kern_result = IOServiceGetMatchingServices( master_port,
@@ -808,7 +808,7 @@ cdio_get_default_device_osx(void)
do do
{ {
str_bsd_path = IORegistryEntryCreateCFProperty( next_media, str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
CFSTR( kIOBSDName ), CFSTR( kIOBSDNameKey ),
kCFAllocatorDefault, kCFAllocatorDefault,
0 ); 0 );
if( str_bsd_path == NULL ) if( str_bsd_path == NULL )