diff --git a/lib/Makefile.am b/lib/Makefile.am index 42d2c4fd..d43ac1bd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.3 2003/03/29 17:32:00 rocky Exp $ +# $Id: Makefile.am,v 1.4 2003/04/03 12:16:27 rocky Exp $ # # Copyright (C) 2003 Rocky Bernstein # @@ -23,7 +23,7 @@ noinst_HEADERS = cdio_assert.h bytesex.h bytesex_asm.h \ cdio_private.h ds.h -include_HEADERS = cdio.h logging.h sector.h cdio_types.h util.h +include_HEADERS = cdio.h logging.h sector.h types.h util.h libcdio_sources = \ _cdio_bincue.c \ @@ -43,7 +43,7 @@ libcdio_sources = \ cdio.h \ ds.c \ ds.h \ - cdio_types.h \ + types.h \ logging.c \ logging.h \ sector.c \ diff --git a/lib/_cdio_stream.h b/lib/_cdio_stream.h index 769475ee..8ac7917d 100644 --- a/lib/_cdio_stream.h +++ b/lib/_cdio_stream.h @@ -1,5 +1,5 @@ /* - $Id: _cdio_stream.h,v 1.2 2003/03/29 17:32:00 rocky Exp $ + $Id: _cdio_stream.h,v 1.3 2003/04/03 12:16:27 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2003 Rocky Bernstein @@ -23,7 +23,7 @@ #ifndef __CDIO_STREAM_H__ #define __CDIO_STREAM_H__ -#include "cdio_types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/lib/bytesex.h b/lib/bytesex.h index 62dfa27c..d4d1ae19 100644 --- a/lib/bytesex.h +++ b/lib/bytesex.h @@ -1,5 +1,5 @@ /* - $Id: bytesex.h,v 1.1 2003/03/24 19:01:09 rocky Exp $ + $Id: bytesex.h,v 1.2 2003/04/03 12:16:27 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -21,7 +21,7 @@ #ifndef __CDIO_BYTESEX_H__ #define __CDIO_BYTESEX_H__ -#include "cdio_types.h" +#include "types.h" #include "logging.h" #include "bytesex_asm.h" diff --git a/lib/bytesex_asm.h b/lib/bytesex_asm.h index a2149011..a4dfeaca 100644 --- a/lib/bytesex_asm.h +++ b/lib/bytesex_asm.h @@ -1,5 +1,5 @@ /* - $Id: bytesex_asm.h,v 1.1 2003/03/24 19:01:09 rocky Exp $ + $Id: bytesex_asm.h,v 1.2 2003/04/03 12:16:27 rocky Exp $ Copyright (C) 2001 Sven Ottemann 2001 Herbert Valerio Riedel @@ -23,7 +23,7 @@ #define __CDIO_BYTESEX_ASM_H__ #if !defined(DISABLE_ASM_OPTIMIZE) -#include "cdio_types.h" +#include "types.h" #if defined(__powerpc__) && defined(__GNUC__) diff --git a/lib/cdio.h b/lib/cdio.h index 11fedd70..c951c6ad 100644 --- a/lib/cdio.h +++ b/lib/cdio.h @@ -1,5 +1,5 @@ /* - $Id: cdio.h,v 1.4 2003/03/30 13:01:22 rocky Exp $ + $Id: cdio.h,v 1.5 2003/04/03 12:16:27 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2003 Rocky Bernstein @@ -32,7 +32,7 @@ #include #endif -#include "cdio_types.h" +#include "types.h" #include "sector.h" /* Flags specifying the category of device to open or is opened. */ diff --git a/lib/cdio_assert.h b/lib/cdio_assert.h index eb5d4e31..0e408a56 100644 --- a/lib/cdio_assert.h +++ b/lib/cdio_assert.h @@ -1,5 +1,5 @@ /* - $Id: cdio_assert.h,v 1.1 2003/03/24 19:01:09 rocky Exp $ + $Id: cdio_assert.h,v 1.2 2003/04/03 12:16:27 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -23,7 +23,7 @@ #if defined(__GNUC__) -#include "cdio_types.h" +#include "types.h" #include "logging.h" #define cdio_assert(expr) \ diff --git a/lib/ds.c b/lib/ds.c index 36267d93..fc818945 100644 --- a/lib/ds.c +++ b/lib/ds.c @@ -1,5 +1,5 @@ /* - $Id: ds.c,v 1.1 2003/03/24 19:01:09 rocky Exp $ + $Id: ds.c,v 1.2 2003/04/03 12:16:27 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -27,10 +27,10 @@ #include "ds.h" #include "util.h" -#include "cdio_types.h" +#include "types.h" #include "cdio_assert.h" -static const char _rcsid[] = "$Id: ds.c,v 1.1 2003/03/24 19:01:09 rocky Exp $"; +static const char _rcsid[] = "$Id: ds.c,v 1.2 2003/04/03 12:16:27 rocky Exp $"; struct _CdioList { diff --git a/lib/ds.h b/lib/ds.h index 52e06d21..2fd34973 100644 --- a/lib/ds.h +++ b/lib/ds.h @@ -1,5 +1,5 @@ /* - $Id: ds.h,v 1.1 2003/03/24 19:01:09 rocky Exp $ + $Id: ds.h,v 1.2 2003/04/03 12:16:27 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -21,7 +21,7 @@ #ifndef __CDIO_DS_H__ #define __CDIO_DS_H__ -#include "cdio_types.h" +#include "types.h" /* opaque... */ typedef struct _CdioList CdioList; diff --git a/lib/logging.h b/lib/logging.h index a77671e5..cfc52c1a 100644 --- a/lib/logging.h +++ b/lib/logging.h @@ -1,5 +1,5 @@ /* - $Id: logging.h,v 1.1 2003/03/24 19:01:09 rocky Exp $ + $Id: logging.h,v 1.2 2003/04/03 12:16:27 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -21,7 +21,7 @@ #ifndef __LOGGING_H__ #define __LOGGING_H__ -#include "cdio_types.h" +#include "types.h" typedef enum { CDIO_LOG_DEBUG = 1, diff --git a/lib/sector.h b/lib/sector.h index c3c15da3..11a6a937 100644 --- a/lib/sector.h +++ b/lib/sector.h @@ -1,5 +1,5 @@ /* - $Id: sector.h,v 1.2 2003/03/29 17:32:00 rocky Exp $ + $Id: sector.h,v 1.3 2003/04/03 12:16:27 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2003 Rocky Bernstein @@ -25,7 +25,7 @@ #ifndef _CDIO_SECTOR_H_ #define _CDIO_SECTOR_H_ -#include "cdio_types.h" +#include "types.h" #define CDIO_PREGAP_SECTORS 150 #define CDIO_POSTGAP_SECTORS 150 diff --git a/lib/cdio_types.h b/lib/types.h similarity index 98% rename from lib/cdio_types.h rename to lib/types.h index 1e68dfab..0142ac67 100644 --- a/lib/cdio_types.h +++ b/lib/types.h @@ -1,5 +1,5 @@ /* - $Id: cdio_types.h,v 1.2 2003/03/29 17:32:00 rocky Exp $ + $Id: types.h,v 1.1 2003/04/03 12:16:27 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2002,2003 Rocky Bernstein