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

Reduce use of cdtext_private.h. Let's see if autoconf 2.61 (circa 6 years ago) is okay. Some MacBooks seem to still use this.

Browse Source
This commit is contained in:
R. Bernstein
2012-04-16 20:21:56 -04:00
parent dd7a5dc1bb
commit c09f15298c
7 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -19,7 +19,7 @@ dnl 02110-1301 USA.
define(RELEASE_NUM, 84)
define(CDIO_VERSION_STR, 0.$1git)
AC_PREREQ(2.67)
AC_PREREQ(2.61)
AC_INIT([libcdio], [CDIO_VERSION_STR(RELEASE_NUM)], [libcdio-help@gnu.org])
AC_CONFIG_SRCDIR(src/cd-info.c)

6
lib/driver/aix.c
View File

@@ -1,5 +1,6 @@
/*
Copyright (C) 2004, 2005, 2006, 2008, 2010, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2005, 2006, 2008, 2010, 2011, 2012
Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,7 +18,6 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#ifdef HAVE_STRING_H
@@ -35,8 +35,6 @@
#ifdef HAVE_AIX_CDROM
static const char _rcsid[] = "$Id: aix.c,v 1.3 2008/04/22 15:29:11 karl Exp $";
#ifdef HAVE_GLOB_H
#include <glob.h>
#endif

8
lib/driver/bsdi.c
View File

@@ -1,7 +1,6 @@
/*
$Id: bsdi.c,v 1.15 2008/04/22 15:29:11 karl Exp $
Copyright (C) 2002, 2003, 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005, 2008, 2012
Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
This program is free software: you can redistribute it and/or modify
@@ -27,8 +26,6 @@
# define __CDIO_CONFIG_H__ 1
#endif
static const char _rcsid[] = "$Id: bsdi.c,v 1.15 2008/04/22 15:29:11 karl Exp $";
#include <cdio/logging.h>
#include <cdio/sector.h>
#include <cdio/util.h>
@@ -57,7 +54,6 @@ static const char _rcsid[] = "$Id: bsdi.c,v 1.15 2008/04/22 15:29:11 karl Exp $"
#include <sys/ioctl.h>
#include </sys/dev/scsi/scsi.h>
#include </sys/dev/scsi/scsi_ioctl.h>
#include "cdtext_private.h"
#include <cdrom.h>
/* This function is in the man page but seems to be missing from the

4
lib/driver/image/nrg.c
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2011
Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2011, 2012
Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -48,8 +48,6 @@
#include "nrg.h"
#include "cdtext_private.h"
static const char _rcsid[] = "$Id: nrg.c,v 1.31 2008/04/21 18:30:22 karl Exp $";
nero_id_t nero_id;
nero_dtype_t nero_dtype;

3
lib/driver/mmc/mmc.c
View File

@@ -1,5 +1,5 @@
/* Common Multimedia Command (MMC) routines.
Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010, 2011
Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2012
Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
@@ -18,7 +18,6 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>

3
lib/driver/osx.c
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011
Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011, 2012
Rocky Bernstein <rocky@gnu.org>
from vcdimager code:
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -30,7 +30,6 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
static const char _rcsid[] = "$Id: osx.c,v 1.14 2008/10/17 11:58:52 rocky Exp $";

1
lib/driver/solaris.c
View File

@@ -19,7 +19,6 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#ifdef HAVE_STRING_H