From c8a89e7dd5cab24242cc9050387bd5bb902da11a Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 30 Jan 2012 21:20:32 +0000 Subject: Remove miscellaneous __STDC__ conditionals. --- libio/filedoalloc.c | 4 +--- libio/fileops.c | 4 +--- libio/genops.c | 4 +--- libio/iofclose.c | 4 +--- libio/iofdopen.c | 6 ++---- libio/iofopen.c | 4 +--- libio/iofopen64.c | 4 +--- libio/iogetdelim.c | 5 ++--- libio/iopopen.c | 4 +--- libio/obprintf.c | 4 +--- libio/oldfileops.c | 4 +--- libio/oldiofclose.c | 5 ++--- libio/oldiofdopen.c | 6 ++---- libio/oldiofopen.c | 4 +--- libio/oldiopopen.c | 4 +--- libio/wfiledoalloc.c | 4 +--- libio/wgenops.c | 5 ++--- 17 files changed, 22 insertions(+), 53 deletions(-) (limited to 'libio') diff --git a/libio/filedoalloc.c b/libio/filedoalloc.c index 4f62dcd910..6cbe2e2422 100644 --- a/libio/filedoalloc.c +++ b/libio/filedoalloc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997, 2001, 2002, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 2001-2002, 2011-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -62,10 +62,8 @@ #include "libioP.h" #include #include -#ifdef __STDC__ #include #include -#endif #ifdef _LIBC # undef isatty diff --git a/libio/fileops.c b/libio/fileops.c index a6f7cbad82..201d063bc0 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1997-2005, 2006, 2007, 2008, 2009, 2011 +/* Copyright (C) 1993, 1995, 1997-2005, 2006, 2007, 2008, 2009, 2011-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner . @@ -40,9 +40,7 @@ #include #include #include -#ifdef __STDC__ #include -#endif #if _LIBC # include "../wcsmbs/wcsmbsload.h" # include "../iconv/gconv_charset.h" diff --git a/libio/genops.c b/libio/genops.c index bb40c34356..aa50456541 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,1995,1997-2002, 2003, 2004, 2006, 2007, 2011 +/* Copyright (C) 1993,1995,1997-2002, 2003, 2004, 2006, 2007, 2011-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -29,9 +29,7 @@ /* Generic or default I/O operations. */ #include "libioP.h" -#ifdef __STDC__ #include -#endif #include #include #ifdef _LIBC diff --git a/libio/iofclose.c b/libio/iofclose.c index aa2ba40064..64e025b970 100644 --- a/libio/iofclose.c +++ b/libio/iofclose.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,1995,1997-2004,2005 Free Software Foundation, Inc. +/* Copyright (C) 1993,1995,1997-2004,2005,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,9 +26,7 @@ in files containing the exception. */ #include "libioP.h" -#ifdef __STDC__ #include -#endif #if _LIBC # include "../iconv/gconv_int.h" # include diff --git a/libio/iofdopen.c b/libio/iofdopen.c index 7f6e593e80..59f44147a3 100644 --- a/libio/iofdopen.c +++ b/libio/iofdopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,1994,1997,1998,1999,2000,2002,2003,2010 +/* Copyright (C) 1993,1994,1997,1998,1999,2000,2002,2003,2010,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -26,9 +26,7 @@ This exception applies to code released by its copyright holders in files containing the exception. */ -#ifdef __STDC__ -# include -#endif +#include #include "libioP.h" #include diff --git a/libio/iofopen.c b/libio/iofopen.c index 5051f7a7af..15374188bd 100644 --- a/libio/iofopen.c +++ b/libio/iofopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,1997,1998,1999,2000,2002,2003 +/* Copyright (C) 1993,1997,1998,1999,2000,2002,2003,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -27,10 +27,8 @@ in files containing the exception. */ #include "libioP.h" -#ifdef __STDC__ #include #include -#endif #ifdef _LIBC # include #else diff --git a/libio/iofopen64.c b/libio/iofopen64.c index 69e62b8cda..fe4dc99c92 100644 --- a/libio/iofopen64.c +++ b/libio/iofopen64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1993,1997,1999,2000,2002,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,9 +26,7 @@ in files containing the exception. */ #include "libioP.h" -#ifdef __STDC__ #include -#endif _IO_FILE * _IO_fopen64 (filename, mode) diff --git a/libio/iogetdelim.c b/libio/iogetdelim.c index a362bf978a..3ee7eac873 100644 --- a/libio/iogetdelim.c +++ b/libio/iogetdelim.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1994,1996-1998,2001,2003,2005 Free Software Foundation, Inc. +/* Copyright (C) 1994,1996-1998,2001,2003,2005,2012 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,9 +26,7 @@ This exception applies to code released by its copyright holders in files containing the exception. */ -#ifdef __STDC__ #include -#endif #include "libioP.h" #include #include diff --git a/libio/iopopen.c b/libio/iopopen.c index 1a5cc0f592..1b2b654388 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997-2002, 2003, 2004, 2007, 2008 +/* Copyright (C) 1993, 1997-2002, 2003, 2004, 2007, 2008, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner . @@ -34,9 +34,7 @@ #if _IO_HAVE_SYS_WAIT #include #include -#ifdef __STDC__ #include -#endif #ifdef _LIBC # include # include diff --git a/libio/obprintf.c b/libio/obprintf.c index c715c2d4a5..d099e56a53 100644 --- a/libio/obprintf.c +++ b/libio/obprintf.c @@ -1,5 +1,5 @@ /* Print output of stream to given obstack. - Copyright (C) 1996,1997,1999,2000,2001,2002,2003,2004,2005,2006,2008 + Copyright (C) 1996,1997,1999,2000,2001,2002,2003,2004,2005,2006,2008,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -20,9 +20,7 @@ 02111-1307 USA. */ -#ifdef __STDC__ #include -#endif #include "libioP.h" #include "strfile.h" #include diff --git a/libio/oldfileops.c b/libio/oldfileops.c index 3e3daa8ae1..900d302965 100644 --- a/libio/oldfileops.c +++ b/libio/oldfileops.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1997-2004, 2005, 2007, 2011 +/* Copyright (C) 1993, 1995, 1997-2004, 2005, 2007, 2011-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner . @@ -42,9 +42,7 @@ #include #include #include -#ifdef __STDC__ #include -#endif #ifndef errno extern int errno; #endif diff --git a/libio/oldiofclose.c b/libio/oldiofclose.c index 62c3154118..34829eae9b 100644 --- a/libio/oldiofclose.c +++ b/libio/oldiofclose.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1993,1995,1997-2002,2004,2005 Free Software Foundation, Inc. +/* Copyright (C) 1993,1995,1997-2002,2004,2005,2012 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,9 +31,7 @@ #define _IO_USE_OLD_IO_FILE #include "libioP.h" -#ifdef __STDC__ #include -#endif int attribute_compat_text_section diff --git a/libio/oldiofdopen.c b/libio/oldiofdopen.c index a1fc6675a4..824c7be3e8 100644 --- a/libio/oldiofdopen.c +++ b/libio/oldiofdopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,94,97,99,2000,2002,2003,2004 +/* Copyright (C) 1993,94,97,99,2000,2002,2003,2004,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -30,9 +30,7 @@ #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) #define _IO_USE_OLD_IO_FILE -#ifdef __STDC__ -# include -#endif +#include #include "libioP.h" #include diff --git a/libio/oldiofopen.c b/libio/oldiofopen.c index c761580a78..fcbc44366d 100644 --- a/libio/oldiofopen.c +++ b/libio/oldiofopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,1997,1999,2000,2002,2003,2004 +/* Copyright (C) 1993,1997,1999,2000,2002,2003,2004,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -31,9 +31,7 @@ #define _IO_USE_OLD_IO_FILE #include "libioP.h" -#ifdef __STDC__ #include -#endif _IO_FILE * diff --git a/libio/oldiopopen.c b/libio/oldiopopen.c index 2fa1ac5a37..fe09aed846 100644 --- a/libio/oldiopopen.c +++ b/libio/oldiopopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2002, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1998-2002, 2004, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner . @@ -34,9 +34,7 @@ #if _IO_HAVE_SYS_WAIT #include #include -#ifdef __STDC__ #include -#endif #ifdef _LIBC # include #endif diff --git a/libio/wfiledoalloc.c b/libio/wfiledoalloc.c index 67a05175b2..168bdddc2e 100644 --- a/libio/wfiledoalloc.c +++ b/libio/wfiledoalloc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997, 1999, 2000, 2002, 2006 +/* Copyright (C) 1993, 1997, 1999, 2000, 2002, 2006, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -63,10 +63,8 @@ #include "libioP.h" #include #include -#ifdef __STDC__ #include #include -#endif #ifdef _LIBC # undef isatty diff --git a/libio/wgenops.c b/libio/wgenops.c index e2adedd6d4..d9709cab8d 100644 --- a/libio/wgenops.c +++ b/libio/wgenops.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1993,1995,1997-2002,2004,2006 Free Software Foundation, Inc. +/* Copyright (C) 1993,1995,1997-2002,2004,2006,2012 + Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Ulrich Drepper . Based on the single byte version by Per Bothner . @@ -30,9 +31,7 @@ /* Generic or default I/O operations. */ #include "libioP.h" -#ifdef __STDC__ #include -#endif #include #include -- cgit 1.4.1