Make sure config.h or the copy of that gets included only once to reduce duplicate include

warnings.
This commit is contained in:
R. Bernstein
2011-10-20 19:44:10 -04:00
parent b7203f5d6b
commit f215cad224
94 changed files with 223 additions and 190 deletions

View File

@@ -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 <hvr@gnu.org>
Copyright (C) 2001, 2008, 2011 Herbert Valerio Riedel <hvr@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
@@ -19,6 +17,7 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <assert.h>

View File

@@ -1,5 +1,5 @@
/* -*- C -*-
Copyright (C) 2004, 2006, 2008, 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2006, 2008, 2010, 2011 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
@@ -20,6 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>

View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2004, 2008, 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2008, 2010, 2011 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
@@ -20,6 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>

View File

@@ -20,6 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>

View File

@@ -20,6 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>

View File

@@ -1,5 +1,5 @@
/* -*- C -*-
Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2010, 2011 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
@@ -16,6 +16,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#ifdef HAVE_STDIO_H
#include <stdio.h>

View File

@@ -21,6 +21,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>

View File

@@ -21,6 +21,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>

View File

@@ -1,5 +1,5 @@
/* -*- C -*-
Copyright (C) 2008, 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2008, 2010, 2011 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
@@ -22,8 +22,9 @@
#include <cdio/logging.h>
#include <cdio/cdtext.h>
#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

View File

@@ -1,5 +1,5 @@
/* -*- C -*-
Copyright (C) 2009 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2009, 2011 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
@@ -20,6 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>

View File

@@ -1,5 +1,5 @@
/* -*- C -*-
Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2010, 2011 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
@@ -20,6 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#ifdef HAVE_STDIO_H

View File

@@ -1,5 +1,5 @@
/* -*- C -*-
Copyright (C) 2009 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2009, 2011 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
@@ -20,6 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>

View File

@@ -1,5 +1,5 @@
/* -*- C -*-
Copyright (C) 2009, 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2009, 2010, 2011 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
@@ -20,6 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>

View File

@@ -1,5 +1,5 @@
/* -*- C -*-
Copyright (C) 2009 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2009, 2011 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
@@ -20,6 +20,7 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#ifdef HAVE_STDIO_H
#include <stdio.h>

View File

@@ -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 <hvr@gnu.org>
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 */

View File

@@ -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 <rocky@gnu.org>
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 <cdio/cdio.h>
#include <cdio/cd_types.h>

View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2008, 2009 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2008, 2009, 2011 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
@@ -21,6 +21,7 @@
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/cdio.h>
#include <cdio/cd_types.h>

View File

@@ -20,6 +20,7 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <stdio.h>

View File

@@ -1,5 +1,6 @@
/*
Copyright (C) 2003, 2006, 2007, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2003, 2006, 2007, 2008, 2009, 2011
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
@@ -18,6 +19,7 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <ctype.h>

View File

@@ -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
<rocky@gnu.org>
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"

View File

@@ -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 <rocky@gnu.org>
Copyright (C) 2005, 2006, 2008, 2011 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
@@ -21,6 +19,7 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <cdio/paranoia.h>

View File

@@ -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 <rocky@gnu.org>
Copyright (C) 2003, 2004, 2005, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2008 Robert W. Fuller <hydrologiccycle@gmail.com>
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 <cdio/cdio.h>
#include <cdio/cd_types.h>