read.h needs <sys/types.h> Add it into cdio_config.h and include only

once.  Fixed based on observation and suggestion of Steve Schultz.
This commit is contained in:
rocky
2006-01-21 12:02:55 +00:00
parent fe1bef3563
commit 6a83b97a27
5 changed files with 33 additions and 17 deletions

8
NEWS
View File

@@ -1,4 +1,4 @@
$Id: NEWS,v 1.88 2006/01/14 10:39:34 rocky Exp $ $Id: NEWS,v 1.89 2006/01/21 12:02:55 rocky Exp $
version 0.77cvs version 0.77cvs
===================================== =====================================
@@ -24,6 +24,10 @@ version 0.77cvs
- Doxygen formatting improvements. - Doxygen formatting improvements.
- Misc bugs: fixed bincue driver caused core dump on set_speed and
set_blocksize. read.h didn't make sure off_t was defined. Switch from
fseek to lseek.
version 0.76 version 0.76
===================================== =====================================
2005-09-23 2005-09-23
@@ -311,4 +315,4 @@ version 0.1
Routines split off from VCDImager. Routines split off from VCDImager.
$Id: NEWS,v 1.88 2006/01/14 10:39:34 rocky Exp $ $Id: NEWS,v 1.89 2006/01/21 12:02:55 rocky Exp $

View File

@@ -1,4 +1,4 @@
dnl Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> dnl Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com>
dnl dnl
dnl This program is free software; you can redistribute it and/or modify dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by dnl it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 77)
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.182 2006/01/05 21:57:40 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.183 2006/01/21 12:02:55 rocky 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)
@@ -687,7 +687,7 @@ cat > include/cdio/cdio_config.h << EOF
version of config.h version of config.h
*/ */
EOF EOF
head -n 196 config.h >> include/cdio/cdio_config.h head -n 199 config.h >> include/cdio/cdio_config.h
]],[[]]) ]],[[]])
AC_OUTPUT AC_OUTPUT

View File

@@ -1,5 +1,5 @@
/* -*- c -*- /* -*- c -*-
$Id: device.h,v 1.30 2006/01/15 01:26:50 rocky Exp $ $Id: device.h,v 1.31 2006/01/21 12:02:55 rocky Exp $
Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
@@ -355,8 +355,8 @@ extern "C" {
@param p_misc_cap pointer to return miscellaneous other capabilities @param p_misc_cap pointer to return miscellaneous other capabilities
In some situations of drivers or OS's we can't find a CD device if In some situations of drivers or OS's we can't find a CD device if
there is no media in it and it is possible for this routine to return there is no media in it. In this situation capabilities will show up as
NULL even though there may be a hardware CD-ROM. NULL even though there isa hardware CD-ROM.
*/ */
void cdio_get_drive_cap (const CdIo_t *p_cdio, void cdio_get_drive_cap (const CdIo_t *p_cdio,
cdio_drive_read_cap_t *p_read_cap, cdio_drive_read_cap_t *p_read_cap,
@@ -366,11 +366,11 @@ extern "C" {
/*! /*!
Get the drive capabilities for a specified device. Get the drive capabilities for a specified device.
@return a list of device capabilities. Return a list of device capabilities.
In some situations of drivers or OS's we can't find a CD device if In some situations of drivers or OS's we can't find a CD device if
there is no media in it and it is possible for this routine to return there is no media in it. In this situation capabilities will show up as
NULL even though there may be a hardware CD-ROM. NULL even though there isa hardware CD-ROM.
*/ */
void cdio_get_drive_cap_dev (const char *device, void cdio_get_drive_cap_dev (const char *device,
cdio_drive_read_cap_t *p_read_cap, cdio_drive_read_cap_t *p_read_cap,
@@ -467,7 +467,7 @@ extern "C" {
Get a string decribing driver_id. Get a string decribing driver_id.
@param driver_id the driver you want the description for @param driver_id the driver you want the description for
@return a sring of driver description @return a string of driver description
*/ */
const char *cdio_driver_describe (driver_id_t driver_id); const char *cdio_driver_describe (driver_id_t driver_id);
@@ -866,7 +866,7 @@ extern "C" {
char *cdio_is_cuefile(const char *cue_name); char *cdio_is_cuefile(const char *cue_name);
/*! /*!
Determine if psg_nrg is a Nero CD disk image. Determine if psg_nrg is a Nero CD disc image.
@param psz_nrg location of presumed NRG image file. @param psz_nrg location of presumed NRG image file.
@return true if psz_nrg is a Nero NRG image or false @return true if psz_nrg is a Nero NRG image or false
@@ -875,7 +875,7 @@ extern "C" {
bool cdio_is_nrg(const char *psz_nrg); bool cdio_is_nrg(const char *psz_nrg);
/*! /*!
Determine if psg_toc is a TOC file for a cdrdao CD disk image. Determine if psz_toc is a TOC file for a cdrdao CD disc image.
@param psz_toc location of presumed TOC image file. @param psz_toc location of presumed TOC image file.
@return true if toc_name is a cdrdao TOC file or false @return true if toc_name is a cdrdao TOC file or false

View File

@@ -1,5 +1,5 @@
/* -*- c -*- /* -*- c -*-
$Id: read.h,v 1.8 2006/01/14 09:44:53 rocky Exp $ $Id: read.h,v 1.9 2006/01/21 12:02:55 rocky Exp $
Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
@@ -27,6 +27,12 @@
#ifndef __CDIO_READ_H__ #ifndef __CDIO_READ_H__
#define __CDIO_READ_H__ #define __CDIO_READ_H__
#ifndef LIBCDIO_CONFIG_H
#define LIBCDIO_CONFIG_H
/* Need for HAVE_SYS_TYPES_H */
#include <cdio/cdio_config.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */

View File

@@ -1,8 +1,9 @@
/* /*
$Id: types.h,v 1.33 2005/11/06 00:39:37 rocky Exp $ $Id: types.h,v 1.34 2006/01/21 12:02:55 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004, 2005, 2006
Rocky Bernstein <rocky@panix.com>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -32,7 +33,12 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#ifndef LIBCDIO_CONFIG_H #ifndef LIBCDIO_CONFIG_H
#define LIBCDIO_CONFIG_H
#include <cdio/cdio_config.h> #include <cdio/cdio_config.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif #endif
/* provide some C99 definitions */ /* provide some C99 definitions */