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

Few fixed for the big rename and fixed a long standing mmmm thing that bothered me, -I-I../lib ;)

Browse Source
This commit is contained in:
thesin
2004-06-02 04:52:55 +00:00
parent e9a127ec65
commit 08d7ceae64
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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.80 2004/05/31 15:21:48 thesin Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.81 2004/06/02 04:52:55 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
@@ -222,7 +222,7 @@ AC_HAVE_HEADERS( errno.h fcntl.h \
strings.h linux/version.h sys/cdio.h sys/stat.h \ strings.h linux/version.h sys/cdio.h sys/stat.h \
sys/types.h ) sys/types.h )
LIBCDIO_CFLAGS='-I$(top_srcdir)/lib/ -I$(top_srcdir)/include/' LIBCDIO_CFLAGS='$(top_srcdir)/lib/ -I$(top_srcdir)/include/'
LIBCDIO_LIBS='$(top_builddir)/lib/libcdio.la' LIBCDIO_LIBS='$(top_builddir)/lib/libcdio.la'
LIBISO9660_LIBS='$(top_builddir)/lib/libiso9660.la' LIBISO9660_LIBS='$(top_builddir)/lib/libiso9660.la'
AC_SUBST(LIBCDIO_CFLAGS) AC_SUBST(LIBCDIO_CFLAGS)

8
lib/_cdio_osx.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_osx.c,v 1.28 2004/06/02 01:01:18 rocky Exp $ $Id: _cdio_osx.c,v 1.29 2004/06/02 04:52:55 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.28 2004/06/02 01:01:18 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.29 2004/06/02 04:52:55 thesin Exp $";
#include <cdio/sector.h> #include <cdio/sector.h>
#include <cdio/util.h> #include <cdio/util.h>
@@ -94,7 +94,7 @@ typedef struct {
} _img_private_t; } _img_private_t;
static void static void
_free_osx (void *env) { _free_osx (void *user_data) {
_img_private_t *env = user_data; _img_private_t *env = user_data;
if (NULL == env) return; if (NULL == env) return;
cdio_generic_free(env); cdio_generic_free(env);
@@ -713,7 +713,7 @@ cdio_get_devices_osx(void)
#ifndef HAVE_DARWIN_CDROM #ifndef HAVE_DARWIN_CDROM
return NULL; return NULL;
#else #else
ioenvect_t next_media; io_object_t next_media;
mach_port_t master_port; mach_port_t master_port;
kern_return_t kern_result; kern_return_t kern_result;
io_iterator_t media_iterator; io_iterator_t media_iterator;