diff --git a/example/cdchange.c b/example/cdchange.c index 9488dd5e..f08cb21f 100644 --- a/example/cdchange.c +++ b/example/cdchange.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 + Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Rocky Bernstein This program is free software: you can redistribute it and/or modify @@ -20,6 +20,7 @@ say opensolaris. */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/example/isolist.c b/example/isolist.c index e19da701..0cb86b96 100644 --- a/example/isolist.c +++ b/example/isolist.c @@ -1,7 +1,6 @@ /* - $Id: isolist.c,v 1.3 2008/03/24 15:30:56 karl Exp $ - - Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 + Rocky Bernstein 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 @@ -32,6 +31,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/example/isolsn.c b/example/isolsn.c index f2a6509d..cdcfa06c 100644 --- a/example/isolsn.c +++ b/example/isolsn.c @@ -1,7 +1,6 @@ /* - $Id: isolsn.c,v 1.2 2008/03/24 15:30:56 karl Exp $ - - Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 + Rocky Bernstein 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 @@ -34,6 +33,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/example/mmc1.c b/example/mmc1.c index f0266a6f..84fb470e 100644 --- a/example/mmc1.c +++ b/example/mmc1.c @@ -1,5 +1,6 @@ /* - Copyright (C) 2004, 2005, 2008, 2009, 2010 Rocky Bernstein + Copyright (C) 2004, 2005, 2008, 2009, 2010, 2011 + Rocky Bernstein 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 @@ -22,6 +23,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #ifdef HAVE_SYS_TYPES_H diff --git a/example/mmc2.c b/example/mmc2.c index 128f66bc..46eb1db2 100644 --- a/example/mmc2.c +++ b/example/mmc2.c @@ -19,6 +19,7 @@ from the MMC GET_CONFIGURATION command . */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #ifdef HAVE_SYS_TYPES_H diff --git a/example/mmc2a.c b/example/mmc2a.c index 9b74cf6e..1a4848d8 100644 --- a/example/mmc2a.c +++ b/example/mmc2a.c @@ -1,5 +1,6 @@ /* - Copyright (C) 2006, 2008, 2009, 2010 Rocky Bernstein + Copyright (C) 2006, 2008, 2009, 2010, 2011 + Rocky Bernstein 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 @@ -22,6 +23,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #ifdef HAVE_SYS_TYPES_H diff --git a/example/mmc3.c b/example/mmc3.c index 3c05928a..135a99eb 100644 --- a/example/mmc3.c +++ b/example/mmc3.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2006, 2008, 2009 Rocky Bernstein + Copyright (C) 2006, 2008, 2009, 2011 Rocky Bernstein 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 @@ -20,6 +20,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/example/paranoia.c b/example/paranoia.c index 7f63a53b..7df6b9c2 100644 --- a/example/paranoia.c +++ b/example/paranoia.c @@ -1,5 +1,6 @@ /* - Copyright (C) 2005, 2006, 2008, 2009, 2010 Rocky Bernstein + Copyright (C) 2005, 2006, 2008, 2009, 2010, 2011 + Rocky Bernstein 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 @@ -22,6 +23,7 @@ say opensolaris. */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/example/udffile.c b/example/udffile.c index ddcd8b4b..2f19916c 100644 --- a/example/udffile.c +++ b/example/udffile.c @@ -1,5 +1,6 @@ /* - Copyright (C) 2005, 2006, 2008, 2009, 2010 Rocky Bernstein + Copyright (C) 2005, 2006, 2008, 2009, 2010, 2011 + Rocky Bernstein 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 @@ -26,6 +27,7 @@ say opensolaris. */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif /* This is the UDF image. */ diff --git a/include/cdio/Makefile.am b/include/cdio/Makefile.am index d4761c17..c7cf1655 100644 --- a/include/cdio/Makefile.am +++ b/include/cdio/Makefile.am @@ -23,8 +23,8 @@ paranoiaheaders = cdda.h cdtext.h endif cdio_config.h: $(top_srcdir)/config.h - echo '#ifndef CDIO_CONFIG_H' > cdio_config.h - echo '#define CDIO_CONFIG_H' >> cdio_config.h + echo '#ifndef __CDIO_CONFIG_H__' > cdio_config.h + echo '#define __CDIO_CONFIG_H__' >> cdio_config.h cat $(top_srcdir)/config.h >>cdio_config.h echo '#endif /* #ifndef CDIO_CONFIG_H */' >>cdio_config.h diff --git a/lib/cdda_interface/common_interface.c b/lib/cdda_interface/common_interface.c index e5dfecd2..54bff7b2 100644 --- a/lib/cdda_interface/common_interface.c +++ b/lib/cdda_interface/common_interface.c @@ -1,5 +1,6 @@ /* - Copyright (C) 2004, 2005, 2007, 2008, 2010 Rocky Bernstein + Copyright (C) 2004, 2005, 2007, 2008, 2010, 2011 + Rocky Bernstein Copyright (C) 1998, 2002 Monty monty@xiph.org This program is free software: you can redistribute it and/or modify diff --git a/lib/cdda_interface/common_interface.h b/lib/cdda_interface/common_interface.h index 216ebd39..dc669af7 100644 --- a/lib/cdda_interface/common_interface.h +++ b/lib/cdda_interface/common_interface.h @@ -1,5 +1,6 @@ /* - Copyright (C) 2004, 2005, 2008, 2009, 2010 Rocky Bernstein + Copyright (C) 2004, 2005, 2008, 2009, 2010, 2011 + Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu This program is free software: you can redistribute it and/or modify @@ -19,8 +20,9 @@ #ifndef _CDDA_COMMON_INTERFACE_H_ #define _CDDA_COMMON_INTERFACE_H_ -#ifdef HAVE_CONFIG_H +#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__) # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/cdda_interface/drive_exceptions.c b/lib/cdda_interface/drive_exceptions.c index d77dbe12..4492acb3 100644 --- a/lib/cdda_interface/drive_exceptions.c +++ b/lib/cdda_interface/drive_exceptions.c @@ -1,7 +1,5 @@ /* - $Id: drive_exceptions.c,v 1.1 2008/06/14 10:36:49 flameeyes Exp $ - - Copyright (C) 2004, 2008 Rocky Bernstein + Copyright (C) 2004, 2008, 2011 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu This program is free software: you can redistribute it and/or modify diff --git a/lib/cdda_interface/toc.c b/lib/cdda_interface/toc.c index 70607177..2134c1f7 100644 --- a/lib/cdda_interface/toc.c +++ b/lib/cdda_interface/toc.c @@ -24,6 +24,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include "low_interface.h" diff --git a/lib/cdda_interface/utils.c b/lib/cdda_interface/utils.c index b5a6c117..0b9e689a 100644 --- a/lib/cdda_interface/utils.c +++ b/lib/cdda_interface/utils.c @@ -1,7 +1,5 @@ /* - $Id: utils.c,v 1.4 2008/04/16 17:00:41 karl Exp $ - - Copyright (C) 2004, 2008, 2010 Rocky Bernstein + Copyright (C) 2004, 2008, 2010, 2011 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu This program is free software: you can redistribute it and/or modify @@ -20,6 +18,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include "common_interface.h" diff --git a/lib/cdio++/devices.cpp b/lib/cdio++/devices.cpp index f234f8cc..69eca770 100644 --- a/lib/cdio++/devices.cpp +++ b/lib/cdio++/devices.cpp @@ -1,7 +1,5 @@ /* -*- C++ -*- - $Id: devices.cpp,v 1.3 2008/04/20 13:44:31 karl Exp $ - - Copyright (C) 2006, 2008 Rocky Bernstein + Copyright (C) 2006, 2008, 2011 Rocky Bernstein 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 @@ -16,7 +14,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "config.h" + +#ifdef HAVE_CONFIG_H +# include "config.h" +# define __CDIO_CONFIG_H__ 1 +#endif + #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/lib/cdio++/iso9660.cpp b/lib/cdio++/iso9660.cpp index 846eec94..3a17f778 100644 --- a/lib/cdio++/iso9660.cpp +++ b/lib/cdio++/iso9660.cpp @@ -1,7 +1,5 @@ /* -*- C++ -*- - $Id: iso9660.cpp,v 1.5 2008/04/20 13:44:31 karl Exp $ - - Copyright (C) 2006, 2008 Rocky Bernstein + Copyright (C) 2006, 2008, 2011 Rocky Bernstein 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 @@ -16,7 +14,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "config.h" + +#ifdef HAVE_CONFIG_H +# include "config.h" +# define __CDIO_CONFIG_H__ 1 +#endif + #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/lib/driver/FreeBSD/freebsd.c b/lib/driver/FreeBSD/freebsd.c index e3557deb..e6ae2f5e 100644 --- a/lib/driver/FreeBSD/freebsd.c +++ b/lib/driver/FreeBSD/freebsd.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2003, 2004, 2005, 2008, 2009, 2010 + Copyright (C) 2003, 2004, 2005, 2008, 2009, 2010, 2011 Rocky Bernstein This program is free software: you can redistribute it and/or modify @@ -23,10 +23,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif -static const char _rcsid[] = "$Id: freebsd.c,v 1.38 2009/10/22 18:30:20 rocky Exp $"; - #include "freebsd.h" #ifdef HAVE_FREEBSD_CDROM diff --git a/lib/driver/MSWindows/aspi32.c b/lib/driver/MSWindows/aspi32.c index d0b28e06..e4e8e2af 100644 --- a/lib/driver/MSWindows/aspi32.c +++ b/lib/driver/MSWindows/aspi32.c @@ -1,5 +1,6 @@ /* - Copyright (C) 2004, 2005, 2008, 2009, 2010 Rocky Bernstein + Copyright (C) 2004, 2005, 2008, 2009, 2010, 2011 + Rocky Bernstein 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 @@ -22,10 +23,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif -static const char _rcsid[] = "$Id: aspi32.c,v 1.11 2008/04/21 18:30:21 karl Exp $"; - #include #include #include diff --git a/lib/driver/MSWindows/win32.c b/lib/driver/MSWindows/win32.c index ef349a23..6e2cb859 100644 --- a/lib/driver/MSWindows/win32.c +++ b/lib/driver/MSWindows/win32.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010 + Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011 Rocky Bernstein This program is free software: you can redistribute it and/or modify @@ -22,6 +22,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif static const char _rcsid[] = "$Id: win32.c,v 1.37 2008/04/21 18:30:21 karl Exp $"; diff --git a/lib/driver/_cdio_generic.c b/lib/driver/_cdio_generic.c index fe976cf8..c7e811d8 100644 --- a/lib/driver/_cdio_generic.c +++ b/lib/driver/_cdio_generic.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Rocky Bernstein This program is free software: you can redistribute it and/or modify @@ -21,10 +21,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif -static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.27 2008/04/22 15:29:11 karl Exp $"; - #include #include #include diff --git a/lib/driver/_cdio_stdio.c b/lib/driver/_cdio_stdio.c index fec8538e..8d692d3e 100644 --- a/lib/driver/_cdio_stdio.c +++ b/lib/driver/_cdio_stdio.c @@ -1,7 +1,5 @@ /* - $Id: _cdio_stdio.c,v 1.6 2008/04/22 15:29:11 karl Exp $ - - Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2003, 2004, 2005, 2008, 2011 Rocky Bernstein Copyright (C) 2000 Herbert Valerio Riedel This program is free software: you can redistribute it and/or modify @@ -20,6 +18,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/_cdio_stream.c b/lib/driver/_cdio_stream.c index 149e30bb..c1d04892 100644 --- a/lib/driver/_cdio_stream.c +++ b/lib/driver/_cdio_stream.c @@ -1,7 +1,5 @@ /* - $Id: _cdio_stream.c,v 1.9 2008/04/22 15:29:11 karl Exp $ - - Copyright (C) 2005, 2006, 2008 Rocky Bernstein + Copyright (C) 2005, 2006, 2008, 2011 Rocky Bernstein Copyright (C) 2000, 2004, 2005 Herbert Valerio Riedel This program is free software: you can redistribute it and/or modify @@ -20,6 +18,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/aix.c b/lib/driver/aix.c index 84bff75f..774ae0ed 100644 --- a/lib/driver/aix.c +++ b/lib/driver/aix.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2004, 2005, 2006, 2008, 2010 Rocky Bernstein + Copyright (C) 2004, 2005, 2006, 2008, 2010, 2011 Rocky Bernstein 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,6 +17,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STRING_H diff --git a/lib/driver/audio.c b/lib/driver/audio.c index d8b19a12..82a42976 100644 --- a/lib/driver/audio.c +++ b/lib/driver/audio.c @@ -1,7 +1,5 @@ /* - $Id: audio.c,v 1.9 2008/04/22 15:29:11 karl Exp $ - - Copyright (C) 2005, 2008 Rocky Bernstein + Copyright (C) 2005, 2008, 2011 Rocky Bernstein 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 @@ -21,6 +19,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/bsdi.c b/lib/driver/bsdi.c index cf06ceda..d5424eb3 100644 --- a/lib/driver/bsdi.c +++ b/lib/driver/bsdi.c @@ -24,6 +24,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif static const char _rcsid[] = "$Id: bsdi.c,v 1.15 2008/04/22 15:29:11 karl Exp $"; diff --git a/lib/driver/cd_types.c b/lib/driver/cd_types.c index 082dd8d1..860cbe85 100644 --- a/lib/driver/cd_types.c +++ b/lib/driver/cd_types.c @@ -1,7 +1,6 @@ /* - $Id: cd_types.c,v 1.9 2008/06/16 19:39:30 flameeyes Exp $ - - Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein + Copyright (C) 2003, 2004, 2005, 2006, 2008, 2011 + Rocky Bernstein 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 @@ -20,7 +19,10 @@ This tries to determine what kind of CD-image or filesystems on a track we've got. */ -#include "config.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# define __CDIO_CONFIG_H__ 1 +#endif #ifdef HAVE_STDIO_H #include diff --git a/lib/driver/cdio.c b/lib/driver/cdio.c index f56bef29..02a9364f 100644 --- a/lib/driver/cdio.c +++ b/lib/driver/cdio.c @@ -1,7 +1,6 @@ /* - $Id: cdio.c,v 1.14 2008/04/22 15:29:11 karl Exp $ - - Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2003, 2004, 2005, 2008, 2011 + Rocky Bernstein Copyright (C) 2001 Herbert Valerio Riedel This program is free software: you can redistribute it and/or modify @@ -21,6 +20,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/cdio_assert.h b/lib/driver/cdio_assert.h index d3e8afa5..8b020da2 100644 --- a/lib/driver/cdio_assert.h +++ b/lib/driver/cdio_assert.h @@ -1,7 +1,5 @@ /* - $Id: cdio_assert.h,v 1.2 2008/04/22 15:29:11 karl Exp $ - - Copyright (C) 2008 Rocky Bernstein + Copyright (C) 2008, 2011 Rocky Bernstein Copyright (C) 2000 Herbert Valerio Riedel This program is free software: you can redistribute it and/or modify @@ -23,8 +21,9 @@ #if defined(__GNUC__) -#ifdef HAVE_CONFIG_H +#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__) # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/cdtext.c b/lib/driver/cdtext.c index ed7b2631..d1b389e1 100644 --- a/lib/driver/cdtext.c +++ b/lib/driver/cdtext.c @@ -19,6 +19,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/device.c b/lib/driver/device.c index 241ea497..8df6db09 100644 --- a/lib/driver/device.c +++ b/lib/driver/device.c @@ -1,7 +1,6 @@ /* - $Id: device.c,v 1.41 2008/04/22 15:29:12 karl Exp $ - - Copyright (C) 2005, 2006, 2008 Rocky Bernstein + Copyright (C) 2005, 2006, 2008, 2011 + Rocky Bernstein 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 @@ -21,6 +20,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/disc.c b/lib/driver/disc.c index 11c4dc52..fc2934fa 100644 --- a/lib/driver/disc.c +++ b/lib/driver/disc.c @@ -1,7 +1,6 @@ /* - $Id: disc.c,v 1.6 2008/04/22 15:29:12 karl Exp $ - - Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2003, 2004, 2005, 2008, 2011 + Rocky Bernstein Copyright (C) 2001 Herbert Valerio Riedel This program is free software: you can redistribute it and/or modify @@ -21,6 +20,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/ds.c b/lib/driver/ds.c index 77d390f7..a062beea 100644 --- a/lib/driver/ds.c +++ b/lib/driver/ds.c @@ -1,7 +1,5 @@ /* - $Id: ds.c,v 1.4 2008/04/22 15:29:12 karl Exp $ - - Copyright (C) 2005, 2008 Rocky Bernstein + Copyright (C) 2005, 2008, 2011 Rocky Bernstein Copyright (C) 2000 Herbert Valerio Riedel This program is free software: you can redistribute it and/or modify @@ -20,6 +18,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/gnu_linux.c b/lib/driver/gnu_linux.c index 08b0c5da..60f44fa9 100644 --- a/lib/driver/gnu_linux.c +++ b/lib/driver/gnu_linux.c @@ -1,6 +1,6 @@ /* Copyright (C) 2001 Herbert Valerio Riedel - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Rocky Bernstein This program is free software: you can redistribute it and/or modify @@ -23,10 +23,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif -static const char _rcsid[] = "$Id: gnu_linux.c,v 1.33 2008/06/25 07:46:21 rocky Exp $"; - #ifdef HAVE_STRING_H #include #endif diff --git a/lib/driver/image.h b/lib/driver/image.h index acdb96ba..0a88f555 100644 --- a/lib/driver/image.h +++ b/lib/driver/image.h @@ -1,7 +1,5 @@ /* - $Id: image.h,v 1.9 2008/04/22 15:29:12 karl Exp $ - - Copyright (C) 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein 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 @@ -26,8 +24,9 @@ #ifndef __CDIO_IMAGE_H__ #define __CDIO_IMAGE_H__ -#ifdef HAVE_CONFIG_H +#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__) # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/image/bincue.c b/lib/driver/image/bincue.c index 61106332..2ddd85dc 100644 --- a/lib/driver/image/bincue.c +++ b/lib/driver/image/bincue.c @@ -1,7 +1,5 @@ /* - $Id: bincue.c,v 1.23 2008/04/21 18:30:22 karl Exp $ - - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008 + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2011 Rocky Bernstein Copyright (C) 2001 Herbert Valerio Riedel cue parsing routine adapted from cuetools @@ -26,8 +24,6 @@ (*.cue). */ -static const char _rcsid[] = "$Id: bincue.c,v 1.23 2008/04/21 18:30:22 karl Exp $"; - #include "image.h" #include "cdio_assert.h" #include "cdio_private.h" diff --git a/lib/driver/image/nrg.c b/lib/driver/image/nrg.c index ebfd0d7e..1573bda7 100644 --- a/lib/driver/image/nrg.c +++ b/lib/driver/image/nrg.c @@ -1,7 +1,5 @@ /* - $Id: nrg.c,v 1.31 2008/04/21 18:30:22 karl Exp $ - - Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 + Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2011 Rocky Bernstein Copyright (C) 2001, 2003 Herbert Valerio Riedel diff --git a/lib/driver/image_common.c b/lib/driver/image_common.c index 146bf155..8b91c3f6 100644 --- a/lib/driver/image_common.c +++ b/lib/driver/image_common.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2004, 2005, 2008, 2010 Rocky Bernstein + Copyright (C) 2004, 2005, 2008, 2010, 2011 Rocky Bernstein 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 diff --git a/lib/driver/logging.c b/lib/driver/logging.c index 5a4a7b38..bac7b211 100644 --- a/lib/driver/logging.c +++ b/lib/driver/logging.c @@ -1,7 +1,5 @@ /* - $Id: logging.c,v 1.2 2008/04/22 15:29:12 karl Exp $ - - Copyright (C) 2003, 2004, 2008 Rocky Bernstein + Copyright (C) 2003, 2004, 2008, 2011 Rocky Bernstein Copyright (C) 2000 Herbert Valerio Riedel This program is free software: you can redistribute it and/or modify @@ -20,6 +18,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/mmc/mmc.c b/lib/driver/mmc/mmc.c index 161c144b..d5915719 100644 --- a/lib/driver/mmc/mmc.c +++ b/lib/driver/mmc/mmc.c @@ -1,5 +1,5 @@ /* Common Multimedia Command (MMC) routines. - Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010, 2011 Rocky Bernstein This program is free software: you can redistribute it and/or modify @@ -18,6 +18,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/mmc/mmc_hl_cmds.c b/lib/driver/mmc/mmc_hl_cmds.c index 42108ed2..3f358630 100644 --- a/lib/driver/mmc/mmc_hl_cmds.c +++ b/lib/driver/mmc/mmc_hl_cmds.c @@ -2,7 +2,7 @@ "Higher-level" Multimedia Command (MMC) commands which build on the "lower-level" commands. - Copyright (C) 2010 Rocky Bernstein + Copyright (C) 2010, 2011 Rocky Bernstein 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 @@ -19,6 +19,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/mmc/mmc_ll_cmds.c b/lib/driver/mmc/mmc_ll_cmds.c index 4b250640..dd6ae16a 100644 --- a/lib/driver/mmc/mmc_ll_cmds.c +++ b/lib/driver/mmc/mmc_ll_cmds.c @@ -2,7 +2,7 @@ Wrappers for specific Multimedia Command (MMC) commands e.g., READ DISC, START/STOP UNIT. - Copyright (C) 2010 Rocky Bernstein + Copyright (C) 2010, 2011 Rocky Bernstein 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 @@ -20,6 +20,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/mmc/mmc_util.c b/lib/driver/mmc/mmc_util.c index 4c3963f7..99c68af7 100644 --- a/lib/driver/mmc/mmc_util.c +++ b/lib/driver/mmc/mmc_util.c @@ -1,7 +1,7 @@ /* Multimedia Command (MMC) "helper" routines that don't depend on anything other than headers. - Copyright (C) 2010 Rocky Bernstein + Copyright (C) 2010, 2011 Rocky Bernstein 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 @@ -19,6 +19,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDIO_H diff --git a/lib/driver/netbsd.c b/lib/driver/netbsd.c index 1fd87ec9..7c33a1f7 100644 --- a/lib/driver/netbsd.c +++ b/lib/driver/netbsd.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008, 2010 Rocky Bernstein + Copyright (C) 2008, 2010, 2011 Rocky Bernstein 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 @@ -42,7 +42,8 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/os2.c b/lib/driver/os2.c index 6e6d29f5..fa543e99 100644 --- a/lib/driver/os2.c +++ b/lib/driver/os2.c @@ -1,6 +1,4 @@ /* - $Id: os2.c,v 1.30 2008/04/21 18:30:21 karl Exp $ - Copyright (C) 2009 KO Myung-Hun This program is free software: you can redistribute it and/or modify @@ -23,6 +21,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif static const char _rcsid[] = "$Id: os2.c,v 1.30 2008/04/21 18:30:21 karl Exp $"; diff --git a/lib/driver/osx.c b/lib/driver/osx.c index f15a4d95..f0ad9ca7 100644 --- a/lib/driver/osx.c +++ b/lib/driver/osx.c @@ -1,5 +1,6 @@ /* - Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010 Rocky Bernstein + Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011 + Rocky Bernstein from vcdimager code: Copyright (C) 2001 Herbert Valerio Riedel and VideoLAN code Copyright (C) 1998-2001 VideoLAN @@ -28,7 +29,8 @@ */ #ifdef HAVE_CONFIG_H -#include "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 $"; diff --git a/lib/driver/portable.h b/lib/driver/portable.h index 42e4d9e5..48034281 100644 --- a/lib/driver/portable.h +++ b/lib/driver/portable.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006, 2008 Rocky Bernstein + Copyright (C) 2006, 2008, 2011 Rocky Bernstein 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 @@ -24,8 +24,9 @@ #ifndef __CDIO_PORTABLE_H__ #define __CDIO_PORTABLE_H__ -#ifdef HAVE_CONFIG_H +#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__) # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #if !defined(HAVE_FTRUNCATE) diff --git a/lib/driver/read.c b/lib/driver/read.c index 9e000ea5..fd7134e0 100644 --- a/lib/driver/read.c +++ b/lib/driver/read.c @@ -1,7 +1,5 @@ /* - $Id: read.c,v 1.12 2008/04/22 15:29:12 karl Exp $ - - Copyright (C) 2005, 2008 Rocky Bernstein + Copyright (C) 2005, 2008, 2011 Rocky Bernstein 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 @@ -24,6 +22,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/realpath.c b/lib/driver/realpath.c index f3042608..79804b55 100644 --- a/lib/driver/realpath.c +++ b/lib/driver/realpath.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2010 + Copyright (C) 2010, 2011 Rocky Bernstein Diego 'Flameeyes' Pettenò Thomas Schmitt @@ -31,6 +31,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/sector.c b/lib/driver/sector.c index 55e23b4c..199f6dc1 100644 --- a/lib/driver/sector.c +++ b/lib/driver/sector.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2004, 2005 Rocky Bernstein + Copyright (C) 2004, 2005, 2011 Rocky Bernstein Copyright (C) 2000 Herbert Valerio Riedel This program is free software; you can redistribute it and/or modify @@ -19,6 +19,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/solaris.c b/lib/driver/solaris.c index eb256a55..963730ca 100644 --- a/lib/driver/solaris.c +++ b/lib/driver/solaris.c @@ -19,6 +19,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STRING_H diff --git a/lib/driver/track.c b/lib/driver/track.c index 96dd9b2d..31fd423f 100644 --- a/lib/driver/track.c +++ b/lib/driver/track.c @@ -1,7 +1,5 @@ /* - $Id: track.c,v 1.7 2008/04/22 15:29:12 karl Exp $ - - Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2003, 2004, 2005, 2008, 2011 Rocky Bernstein Copyright (C) 2001 Herbert Valerio Riedel This program is free software: you can redistribute it and/or modify @@ -22,6 +20,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/driver/utf8.c b/lib/driver/utf8.c index 03ff4e56..9e7a9018 100644 --- a/lib/driver/utf8.c +++ b/lib/driver/utf8.c @@ -1,5 +1,6 @@ /* Copyright (C) 2006, 2008 Burkhard Plaum + Copyright (C) 2011 Rocky Bernstein 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,6 +18,7 @@ /* UTF-8 support */ #ifdef HAVE_CONFIG_H +# define __CDIO_CONFIG_H__ 1 # include "config.h" #endif diff --git a/lib/driver/util.c b/lib/driver/util.c index 725511a3..1e4cb6c0 100644 --- a/lib/driver/util.c +++ b/lib/driver/util.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2003, 2004, 2005, 2008, 2009, 2010 + Copyright (C) 2003, 2004, 2005, 2008, 2009, 2010, 2011 Rocky Bernstein Copyright (C) 2000 Herbert Valerio Riedel @@ -19,6 +19,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/iso9660/iso9660_fs.c b/lib/iso9660/iso9660_fs.c index b937f687..9533fcf2 100644 --- a/lib/iso9660/iso9660_fs.c +++ b/lib/iso9660/iso9660_fs.c @@ -1,7 +1,5 @@ /* - $Id: iso9660_fs.c,v 1.47 2008/04/18 16:02:09 karl Exp $ - - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011 Rocky Bernstein Copyright (C) 2001 Herbert Valerio Riedel @@ -20,8 +18,9 @@ */ /* iso9660 filesystem-based routines */ -#ifdef HAVE_CONFIG_H +#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__) # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STRING_H diff --git a/lib/iso9660/iso9660_private.h b/lib/iso9660/iso9660_private.h index 79b368ac..20ea2b4e 100644 --- a/lib/iso9660/iso9660_private.h +++ b/lib/iso9660/iso9660_private.h @@ -1,7 +1,6 @@ /* - $Id: iso9660_private.h,v 1.5 2008/04/18 16:02:09 karl Exp $ - - Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2003, 2004, 2005, 2008, 2011 + Rocky Bernstein Copyright (C) 2000 Herbert Valerio Riedel See also iso9660.h by Eric Youngdale (1993). @@ -26,8 +25,9 @@ #ifndef __CDIO_ISO9660_PRIVATE_H__ #define __CDIO_ISO9660_PRIVATE_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" +#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__) +# include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/iso9660/xa.c b/lib/iso9660/xa.c index cf0fcd22..78990cdf 100644 --- a/lib/iso9660/xa.c +++ b/lib/iso9660/xa.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2003, 2005, 2008 Rocky Bernstein + Copyright (C) 2003, 2005, 2008, 2011 Rocky Bernstein Copyright (C) 2000 Herbert Valerio Riedel This program is free software: you can redistribute it and/or modify @@ -19,6 +19,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STRING_H diff --git a/lib/paranoia/gap.c b/lib/paranoia/gap.c index c79305fa..3953f1a1 100644 --- a/lib/paranoia/gap.c +++ b/lib/paranoia/gap.c @@ -1,7 +1,5 @@ /* - $Id: gap.c,v 1.4 2008/04/17 17:39:48 karl Exp $ - - Copyright (C) 2004, 2008 Rocky Bernstein + Copyright (C) 2004, 2008, 2011 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu This program is free software: you can redistribute it and/or modify @@ -22,7 +20,10 @@ * ***/ -#include "config.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# define __CDIO_CONFIG_H__ 1 +#endif #include "p_block.h" #include #include "gap.h" diff --git a/lib/paranoia/isort.c b/lib/paranoia/isort.c index 49a808f4..e7c46d82 100644 --- a/lib/paranoia/isort.c +++ b/lib/paranoia/isort.c @@ -1,7 +1,5 @@ /* - $Id: isort.c,v 1.7 2008/04/17 17:39:48 karl Exp $ - - Copyright (C) 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu This program is free software: you can redistribute it and/or modify @@ -36,7 +34,8 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDLIB_H diff --git a/lib/paranoia/overlap.c b/lib/paranoia/overlap.c index 764b1154..91f90dc0 100644 --- a/lib/paranoia/overlap.c +++ b/lib/paranoia/overlap.c @@ -1,7 +1,5 @@ /* - $Id: overlap.c,v 1.6 2008/04/17 17:39:48 karl Exp $ - - Copyright (C) 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu This program is free software: you can redistribute it and/or modify @@ -25,7 +23,8 @@ ***/ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDLIB_H diff --git a/lib/paranoia/p_block.c b/lib/paranoia/p_block.c index a7bdb34f..3616db35 100644 --- a/lib/paranoia/p_block.c +++ b/lib/paranoia/p_block.c @@ -1,6 +1,4 @@ /* - $Id: p_block.c,v 1.13 2008/04/17 17:39:48 karl Exp $ - Copyright (C) 2004, 2005, 2007, 2008 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu @@ -19,7 +17,8 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDLIB_H diff --git a/lib/paranoia/paranoia.c b/lib/paranoia/paranoia.c index 56561b07..7039e4f0 100644 --- a/lib/paranoia/paranoia.c +++ b/lib/paranoia/paranoia.c @@ -85,7 +85,8 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDLIB_H diff --git a/lib/udf/filemode.c b/lib/udf/filemode.c index 97849785..8893ac54 100644 --- a/lib/udf/filemode.c +++ b/lib/udf/filemode.c @@ -1,8 +1,7 @@ /* - $Id: filemode.c,v 1.4 2008/04/18 16:02:10 karl Exp $ filemode.c -- make a string describing file modes - Copyright (C) 2005, 2008 Rocky Bernstein + Copyright (C) 2005, 2008, 2011 Rocky Bernstein Copyright (C) 1985, 1990, 1993, 1998-2000 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -21,6 +20,7 @@ #if HAVE_CONFIG_H # include +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_SYS_STAT_H diff --git a/lib/udf/udf_fs.c b/lib/udf/udf_fs.c index 1fd0e6b6..6d1e833d 100644 --- a/lib/udf/udf_fs.c +++ b/lib/udf/udf_fs.c @@ -1,7 +1,5 @@ /* - $Id: udf_fs.c,v 1.22 2008/04/18 16:02:10 karl Exp $ - - Copyright (C) 2005, 2006, 2008 Rocky Bernstein + Copyright (C) 2005, 2006, 2008, 2011 Rocky Bernstein 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 @@ -45,6 +43,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STRING_H diff --git a/lib/udf/udf_private.h b/lib/udf/udf_private.h index fca90116..92b16687 100644 --- a/lib/udf/udf_private.h +++ b/lib/udf/udf_private.h @@ -1,7 +1,5 @@ /* - $Id: udf_private.h,v 1.12 2008/04/18 16:02:10 karl Exp $ - - Copyright (C) 2005, 2006, 2008 Rocky Bernstein + Copyright (C) 2005, 2006, 2008, 2011 Rocky Bernstein 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 @@ -20,8 +18,9 @@ #ifndef __CDIO_UDF_PRIVATE_H__ #define __CDIO_UDF_PRIVATE_H__ -#if defined(HAVE_CONFIG_H) && !defined(LIBCDIO_CONFIG_H) -#include "config.h" +#if defined(HAVE_CONFIG_H) && !defined(LIBCDIO_CONFIG_H) && !defined(__CDIO_CONFIG_H__) +# include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/lib/udf/udf_time.c b/lib/udf/udf_time.c index 0a7dbc3a..76f5323e 100644 --- a/lib/udf/udf_time.c +++ b/lib/udf/udf_time.c @@ -1,7 +1,5 @@ /* - $Id: udf_time.c,v 1.10 2008/04/24 07:28:00 rocky Exp $ - - Copyright (C) 2005, 2008 Rocky Bernstein + Copyright (C) 2005, 2008, 2011 Rocky Bernstein Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. Modified From part of the GNU C Library. @@ -42,6 +40,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef NEED_TIMEZONEVAR diff --git a/src/cd-paranoia/cd-paranoia.c b/src/cd-paranoia/cd-paranoia.c index a8496eb1..f93e2546 100644 --- a/src/cd-paranoia/cd-paranoia.c +++ b/src/cd-paranoia/cd-paranoia.c @@ -1,8 +1,7 @@ /* - $Id: cd-paranoia.c,v 1.37 2008/06/19 15:44:30 flameeyes Exp $ - - Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rocky Bernstein - (C) 1998 Monty + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 + Rocky Bernstein + Copyright (C) 1998 Monty 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 @@ -22,6 +21,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDIO_H diff --git a/src/cd-paranoia/report.c b/src/cd-paranoia/report.c index 18ff7ccc..775d02a9 100644 --- a/src/cd-paranoia/report.c +++ b/src/cd-paranoia/report.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2004, 2008, 2010 Rocky Bernstein + Copyright (C) 2004, 2008, 2010, 2011 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu This program is free software: you can redistribute it and/or modify @@ -25,7 +25,11 @@ /* config.h has to come first else _FILE_OFFSET_BITS are redefined in say opensolaris. */ -#include "config.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# define __CDIO_CONFIG_H__ 1 +#endif + #include #include #include "report.h" diff --git a/src/cdda-player.c b/src/cdda-player.c index e944377f..b400df3b 100644 --- a/src/cdda-player.c +++ b/src/cdda-player.c @@ -20,7 +20,8 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDIO_H diff --git a/src/cddb.c b/src/cddb.c index cd111891..fd23b791 100644 --- a/src/cddb.c +++ b/src/cddb.c @@ -1,7 +1,5 @@ /* - $Id: cddb.c,v 1.8 2008/06/25 08:01:54 rocky Exp $ - - Copyright (C) 2005, 2008, 2009 Rocky Bernstein + Copyright (C) 2005, 2008, 2009, 2011 Rocky Bernstein 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 @@ -19,6 +17,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/src/mmc-tool.c b/src/mmc-tool.c index 0eb32543..45042096 100644 --- a/src/mmc-tool.c +++ b/src/mmc-tool.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2006, 2008, 2010 Rocky Bernstein + Copyright (C) 2006, 2008, 2010, 2011 Rocky Bernstein 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 @@ -19,6 +19,7 @@ from the MMC GET_CONFIGURATION command . */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #ifdef HAVE_SYS_TYPES_H diff --git a/src/util.h b/src/util.h index 5a45a16e..13ae841b 100644 --- a/src/util.h +++ b/src/util.h @@ -20,8 +20,9 @@ #ifndef UTIL_H #define UTIL_H -#ifdef HAVE_CONFIG_H +#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__) # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/test/check_sizeof.c b/test/check_sizeof.c index 9c14d088..068264dc 100644 --- a/test/check_sizeof.c +++ b/test/check_sizeof.c @@ -1,7 +1,5 @@ /* - $Id: check_sizeof.c,v 1.5 2008/03/22 18:08:25 karl Exp $ - - Copyright (C) 2001, 2008 Herbert Valerio Riedel + Copyright (C) 2001, 2008, 2011 Herbert Valerio Riedel 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 @@ -19,6 +17,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/test/driver/bincue.c.in b/test/driver/bincue.c.in index a3dd6a29..6b7962a4 100644 --- a/test/driver/bincue.c.in +++ b/test/driver/bincue.c.in @@ -1,5 +1,5 @@ /* -*- C -*- - Copyright (C) 2004, 2006, 2008, 2010 Rocky Bernstein + Copyright (C) 2004, 2006, 2008, 2010, 2011 Rocky Bernstein 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 @@ -20,6 +20,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/driver/cdrdao.c.in b/test/driver/cdrdao.c.in index 63735868..cd23831b 100644 --- a/test/driver/cdrdao.c.in +++ b/test/driver/cdrdao.c.in @@ -1,5 +1,5 @@ /* - Copyright (C) 2004, 2008, 2010 Rocky Bernstein + Copyright (C) 2004, 2008, 2010, 2011 Rocky Bernstein 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 @@ -20,6 +20,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/driver/freebsd.c b/test/driver/freebsd.c index 684b7c25..47911319 100644 --- a/test/driver/freebsd.c +++ b/test/driver/freebsd.c @@ -20,6 +20,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/driver/gnu_linux.c b/test/driver/gnu_linux.c index ef936663..4f68fb88 100644 --- a/test/driver/gnu_linux.c +++ b/test/driver/gnu_linux.c @@ -20,6 +20,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/driver/helper.c b/test/driver/helper.c index aaef82a1..ab89cb67 100644 --- a/test/driver/helper.c +++ b/test/driver/helper.c @@ -1,5 +1,5 @@ /* -*- C -*- - Copyright (C) 2010 Rocky Bernstein + Copyright (C) 2010, 2011 Rocky Bernstein 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 @@ -16,6 +16,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDIO_H #include diff --git a/test/driver/mmc_read.c b/test/driver/mmc_read.c index 7d2c2bdf..dc839d90 100644 --- a/test/driver/mmc_read.c +++ b/test/driver/mmc_read.c @@ -21,6 +21,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/driver/mmc_write.c b/test/driver/mmc_write.c index 57254cd4..ac531466 100644 --- a/test/driver/mmc_write.c +++ b/test/driver/mmc_write.c @@ -21,6 +21,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/driver/nrg.c.in b/test/driver/nrg.c.in index ffa16af7..877a8a6c 100644 --- a/test/driver/nrg.c.in +++ b/test/driver/nrg.c.in @@ -1,5 +1,5 @@ /* -*- C -*- - Copyright (C) 2008, 2010 Rocky Bernstein + Copyright (C) 2008, 2010, 2011 Rocky Bernstein 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 @@ -22,8 +22,9 @@ #include #include -#ifdef HAVE_CONFIG_H +#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__) # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDIO_H diff --git a/test/driver/osx.c b/test/driver/osx.c index e3a9482a..5d2b8c13 100644 --- a/test/driver/osx.c +++ b/test/driver/osx.c @@ -1,5 +1,5 @@ /* -*- C -*- - Copyright (C) 2009 Rocky Bernstein + Copyright (C) 2009, 2011 Rocky Bernstein 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 @@ -20,6 +20,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/driver/realpath.c b/test/driver/realpath.c index 36f859fb..2757a9c2 100644 --- a/test/driver/realpath.c +++ b/test/driver/realpath.c @@ -1,5 +1,5 @@ /* -*- C -*- - Copyright (C) 2010 Rocky Bernstein + Copyright (C) 2010, 2011 Rocky Bernstein 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 @@ -20,6 +20,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDIO_H diff --git a/test/driver/solaris.c b/test/driver/solaris.c index 36522fa7..831af279 100644 --- a/test/driver/solaris.c +++ b/test/driver/solaris.c @@ -1,5 +1,5 @@ /* -*- C -*- - Copyright (C) 2009 Rocky Bernstein + Copyright (C) 2009, 2011 Rocky Bernstein 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 @@ -20,6 +20,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/driver/win32.c b/test/driver/win32.c index 5fa9ec15..9f35807c 100644 --- a/test/driver/win32.c +++ b/test/driver/win32.c @@ -1,5 +1,5 @@ /* -*- C -*- - Copyright (C) 2009, 2010 Rocky Bernstein + Copyright (C) 2009, 2010, 2011 Rocky Bernstein 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 @@ -20,6 +20,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/test_lib_driver_util.c b/test/test_lib_driver_util.c index e774acdd..bcecec5b 100644 --- a/test/test_lib_driver_util.c +++ b/test/test_lib_driver_util.c @@ -1,5 +1,5 @@ /* -*- C -*- - Copyright (C) 2009 Rocky Bernstein + Copyright (C) 2009, 2011 Rocky Bernstein 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 @@ -20,6 +20,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #ifdef HAVE_STDIO_H #include diff --git a/test/testassert.c b/test/testassert.c index 4a696657..d764cd72 100644 --- a/test/testassert.c +++ b/test/testassert.c @@ -1,6 +1,4 @@ /* - $Id: testassert.c,v 1.2 2008/03/22 18:08:25 karl Exp $ - Copyright (C) 2001, 2008 Herbert Valerio Riedel This program is free software: you can redistribute it and/or modify @@ -19,6 +17,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif /* Private headers */ diff --git a/test/testdefault.c b/test/testdefault.c index e30accdc..f6468539 100644 --- a/test/testdefault.c +++ b/test/testdefault.c @@ -1,6 +1,4 @@ /* - $Id: testdefault.c,v 1.8 2008/03/22 18:08:25 karl Exp $ - Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein This program is free software: you can redistribute it and/or modify @@ -23,6 +21,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/testgetdevices.c.in b/test/testgetdevices.c.in index f5124ae6..4d870715 100644 --- a/test/testgetdevices.c.in +++ b/test/testgetdevices.c.in @@ -1,5 +1,5 @@ /* - Copyright (C) 2008, 2009 Rocky Bernstein + Copyright (C) 2008, 2009, 2011 Rocky Bernstein 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 @@ -21,6 +21,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include diff --git a/test/testischar.c b/test/testischar.c index e1be8f80..080f1fd0 100644 --- a/test/testischar.c +++ b/test/testischar.c @@ -20,6 +20,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/test/testiso9660.c b/test/testiso9660.c index acab0271..5f5281dd 100644 --- a/test/testiso9660.c +++ b/test/testiso9660.c @@ -1,5 +1,6 @@ /* - Copyright (C) 2003, 2006, 2007, 2008, 2009 Rocky Bernstein + Copyright (C) 2003, 2006, 2007, 2008, 2009, 2011 + Rocky Bernstein 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 @@ -18,6 +19,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/test/testisocd.c b/test/testisocd.c index fa1d9e35..229daacb 100644 --- a/test/testisocd.c +++ b/test/testisocd.c @@ -1,6 +1,5 @@ -/* $Id: testisocd.c,v 1.6 2008/03/22 18:08:25 karl Exp $ - - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Rocky Bernstein +/* + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011 Rocky Bernstein This program is free software: you can redistribute it and/or modify @@ -21,6 +20,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include "portable.h" diff --git a/test/testparanoia.c b/test/testparanoia.c index f004a5e9..e8b6a136 100644 --- a/test/testparanoia.c +++ b/test/testparanoia.c @@ -1,7 +1,5 @@ /* - $Id: testparanoia.c,v 1.14 2008/06/19 15:44:31 flameeyes Exp $ - - Copyright (C) 2005, 2006, 2008 Rocky Bernstein + Copyright (C) 2005, 2006, 2008, 2011 Rocky Bernstein 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 @@ -21,6 +19,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include diff --git a/test/testpregap.c.in b/test/testpregap.c.in index 1a26c560..b049fde5 100644 --- a/test/testpregap.c.in +++ b/test/testpregap.c.in @@ -1,7 +1,5 @@ /* - $Id: testpregap.c.in,v 1.2 2008/06/10 00:45:09 pjcreath Exp $ - - Copyright (C) 2003, 2004, 2005 Rocky Bernstein + Copyright (C) 2003, 2004, 2005, 2011 Rocky Bernstein Copyright (C) 2008 Robert W. Fuller This program is free software: you can redistribute it and/or modify @@ -23,6 +21,7 @@ */ #ifdef HAVE_CONFIG_H # include "config.h" +# define __CDIO_CONFIG_H__ 1 #endif #include #include