claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cd-paranoia/cd-paranoia.c
View File

@@ -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 <rocky@gnu.org>
(C) 1998 Monty <xiphmont@mit.edu>
Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011
Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty <xiphmont@mit.edu>
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

8
src/cd-paranoia/report.c
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>
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 <stdio.h>
#include <cdio/cdda.h>
#include "report.h"

3
src/cdda-player.c
View File

@@ -20,7 +20,8 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#ifdef HAVE_STDIO_H

5
src/cddb.c
View File

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

3
src/mmc-tool.c
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2006, 2008, 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 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
@@ -19,6 +19,7 @@
from the MMC GET_CONFIGURATION command . */
#ifdef HAVE_CONFIG_H
# include "config.h"
# define __CDIO_CONFIG_H__ 1
#endif
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H

3
src/util.h
View File

@@ -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 <stdio.h>