diff options
| author | R. Bernstein <rocky@gnu.org> | 2011-10-20 19:44:10 -0400 |
|---|---|---|
| committer | R. Bernstein <rocky@gnu.org> | 2011-10-20 19:44:10 -0400 |
| commit | f215cad224d852a9671e79faaa2d7d376c6b3c46 (patch) | |
| tree | 32ce1896cc2e470d9b608f1c4945c714640ec1d1 /lib/iso9660 | |
| parent | b7203f5d6b089aba49d2d86f67d0463cb7b5c7df (diff) | |
Make sure config.h or the copy of that gets included only once to reduce duplicate include
warnings.
Diffstat (limited to 'lib/iso9660')
| -rw-r--r-- | lib/iso9660/iso9660_fs.c | 7 | ||||
| -rw-r--r-- | lib/iso9660/iso9660_private.h | 10 | ||||
| -rw-r--r-- | lib/iso9660/xa.c | 3 |
3 files changed, 10 insertions, 10 deletions
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 <rocky@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> @@ -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 <rocky@gnu.org> + Copyright (C) 2003, 2004, 2005, 2008, 2011 + Rocky Bernstein <rocky@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> 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 <cdio/types.h> 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 <rocky@gnu.org> + Copyright (C) 2003, 2005, 2008, 2011 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> 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 |