AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove miscellaneous __STDC__ conditionals.

Browse Source
This commit is contained in:
Joseph Myers 2012-01-30 21:20:32 +00:00
parent 3b1004624e
commit c8a89e7dd5
30 changed files with 67 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ChangeLog
View File

@ -1,3 +1,35 @@
2012-01-30 Joseph Myers <joseph@codesourcery.com>
* crypt/cert.c: Remove __STDC__ conditionals.
* crypt/crypt-entry.c: Likewise.
* crypt/crypt_util.c: Likewise.
* libio/filedoalloc.c: Likewise.
* libio/fileops.c: Likewise.
* libio/genops.c: Likewise.
* libio/iofclose.c: Likewise.
* libio/iofdopen.c: Likewise.
* libio/iofopen.c: Likewise.
* libio/iofopen64.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/obprintf.c: Likewise.
* libio/oldfileops.c: Likewise.
* libio/oldiofclose.c: Likewise.
* libio/oldiofdopen.c: Likewise.
* libio/oldiofopen.c: Likewise.
* libio/oldiopopen.c: Likewise.
* libio/wfiledoalloc.c: Likewise.
* libio/wgenops.c: Likewise.
* locale/programs/xmalloc.c: Likewise.
* misc/syslog.c: Likewise.
* stdio-common/xbug.c: Likewise.
* string/memchr.c: Likewise.
* string/memcmp.c: Likewise.
* string/memrchr.c: Likewise.
* string/rawmemchr.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* time/strftime_l.c: Likewise.
2012-01-30 Joseph Myers <joseph@codesourcery.com>
* configure.in (libc_cv_cc_sse2avx): AC_SUBST.

4
crypt/cert.c
View File

@ -12,14 +12,10 @@
int totfails = 0;
#if __STDC__ - 0
int main (int argc, char *argv[]);
void get8 (char *cp);
void put8 (char *cp);
void good_bye (void) __attribute__ ((noreturn));
#else
void get8(), put8();
#endif
void good_bye ()
{

4
crypt/crypt-entry.c
View File

@ -1,7 +1,7 @@
/*
* UFC-crypt: ultra fast crypt(3) implementation
*
* Copyright (C) 1991,1992,1993,1996,1997,2007 Free Software Foundation, Inc.
* Copyright (C) 1991-1993,1996-1997,2007,2012 Free Software Foundation, Inc.
*
* The GNU C Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -46,7 +46,6 @@
#include "crypt-private.h"
/* Prototypes for local functions. */
#if __STDC__ - 0
#ifndef __GNU_LIBRARY__
void _ufc_clearmem (char *start, int cnt);
#else
@ -61,7 +60,6 @@ extern char *__sha256_crypt (const char *key, const char *salt);
extern char *__sha512_crypt_r (const char *key, const char *salt,
char *buffer, int buflen);
extern char *__sha512_crypt (const char *key, const char *salt);
#endif
/* Define our magic string to mark salt for MD5 encryption
replacement. This is meant to be the same as for other MD5 based

2
crypt/crypt_util.c
View File

@ -49,7 +49,6 @@
#include "crypt-private.h"
/* Prototypes for local functions. */
#if __STDC__ - 0
#ifndef __GNU_LIBRARY__
void _ufc_clearmem (char *start, int cnt);
void _ufc_copymem (char *from, char *to, int cnt);
@ -59,7 +58,6 @@ STATIC void shuffle_sb (long32 *k, ufc_long saltbits);
#else
STATIC void shuffle_sb (long64 *k, ufc_long saltbits);
#endif
#endif
/*

4
libio/filedoalloc.c
View File

@ -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 <sys/types.h>
#include <sys/stat.h>
#ifdef __STDC__
#include <stdlib.h>
#include <unistd.h>
#endif
#ifdef _LIBC
# undef isatty

4
libio/fileops.c
View File

@ -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 <bothner@cygnus.com>.
@ -40,9 +40,7 @@
#include <string.h>
#include <errno.h>
#include <unistd.h>
#ifdef __STDC__
#include <stdlib.h>
#endif
#if _LIBC
# include "../wcsmbs/wcsmbsload.h"
# include "../iconv/gconv_charset.h"

4
libio/genops.c
View File

@ -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 <stdlib.h>
#endif
#include <string.h>
#include <stdbool.h>
#ifdef _LIBC

4
libio/iofclose.c
View File

@ -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 <stdlib.h>
#endif
#if _LIBC
# include "../iconv/gconv_int.h"
# include <shlib-compat.h>

6
libio/iofdopen.c
View File

@ -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 <stdlib.h>
#endif
#include <stdlib.h>
#include "libioP.h"
#include <fcntl.h>

4
libio/iofopen.c
View File

@ -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 <stdlib.h>
#include <stddef.h>
#endif
#ifdef _LIBC
# include <shlib-compat.h>
#else

4
libio/iofopen64.c
View File

@ -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 <stdlib.h>
#endif
_IO_FILE *
_IO_fopen64 (filename, mode)

5
libio/iogetdelim.c
View File

@ -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 <stdlib.h>
#endif
#include "libioP.h"
#include <string.h>
#include <errno.h>

4
libio/iopopen.c
View File

@ -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 <bothner@cygnus.com>.
@ -34,9 +34,7 @@
#if _IO_HAVE_SYS_WAIT
#include <signal.h>
#include <unistd.h>
#ifdef __STDC__
#include <stdlib.h>
#endif
#ifdef _LIBC
# include <unistd.h>
# include <shlib-compat.h>

4
libio/obprintf.c
View File

@ -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 <drepper@cygnus.com>, 1996.
@ -20,9 +20,7 @@
02111-1307 USA. */
#ifdef __STDC__
#include <stdlib.h>
#endif
#include "libioP.h"
#include "strfile.h"
#include <assert.h>

4
libio/oldfileops.c
View File

@ -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 <bothner@cygnus.com>.
@ -42,9 +42,7 @@
#include <sys/stat.h>
#include <string.h>
#include <errno.h>
#ifdef __STDC__
#include <stdlib.h>
#endif
#ifndef errno
extern int errno;
#endif

5
libio/oldiofclose.c
View File

@ -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 <stdlib.h>
#endif
int
attribute_compat_text_section

6
libio/oldiofdopen.c
View File

@ -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 <stdlib.h>
#endif
#include <stdlib.h>
#include "libioP.h"
#include <fcntl.h>

4
libio/oldiofopen.c
View File

@ -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 <stdlib.h>
#endif
_IO_FILE *

4
libio/oldiopopen.c
View File

@ -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 <bothner@cygnus.com>.
@ -34,9 +34,7 @@
#if _IO_HAVE_SYS_WAIT
#include <signal.h>
#include <unistd.h>
#ifdef __STDC__
#include <stdlib.h>
#endif
#ifdef _LIBC
# include <unistd.h>
#endif

4
libio/wfiledoalloc.c
View File

@ -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 <sys/types.h>
#include <sys/stat.h>
#ifdef __STDC__
#include <stdlib.h>
#include <unistd.h>
#endif
#ifdef _LIBC
# undef isatty

5
libio/wgenops.c
View File

@ -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 <drepper@cygnus.com>.
Based on the single byte version by Per Bothner <bothner@cygnus.com>.
@ -30,9 +31,7 @@
/* Generic or default I/O operations. */
#include "libioP.h"
#ifdef __STDC__
#include <stdlib.h>
#endif
#include <string.h>
#include <wchar.h>

6
locale/programs/xmalloc.c
View File

@ -1,5 +1,5 @@
/* xmalloc.c -- malloc with out of memory checking
Copyright (C) 1990,91,92,93,94,95,96,97,2004,2005
Copyright (C) 1990,91,92,93,94,95,96,97,2004,2005,2012
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -21,11 +21,7 @@
#include <config.h>
#endif
#if __STDC__
#define VOID void
#else
#define VOID char
#endif
#include <sys/types.h>

4
misc/syslog.c
View File

@ -51,11 +51,7 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94";
#include <signal.h>
#include <locale.h>
#if __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
#include <libio/iolibio.h>
#include <math_ldbl_opt.h>

2
stdio-common/xbug.c
View File

@ -8,11 +8,9 @@ typedef struct _Buffer {
int room, used;
} Buffer;
#if __STDC__ - 0
void InitBuffer (Buffer *b);
void AppendToBuffer (register Buffer *b, const char *str, register int len);
void ReadFile (register Buffer *buffer, FILE *input);
#endif
#define INIT_BUFFER_SIZE 10000

8
string/memchr.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,93,96,97,99,2000,2003 Free Software Foundation, Inc.
/* Copyright (C) 1991,93,96,97,99,2000,2003,2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
@ -26,11 +26,7 @@
#endif
#undef __ptr_t
#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
# define __ptr_t void *
#else /* Not C++ or ANSI C. */
# define __ptr_t char *
#endif /* C++ or ANSI C. */
#define __ptr_t void *
#if defined _LIBC
# include <string.h>

10
string/memcmp.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,1993,1995,1997,1998,2003,2004
/* Copyright (C) 1991,1993,1995,1997,1998,2003,2004,2012
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
@ -23,13 +23,7 @@
#endif
#undef __ptr_t
#if defined __cplusplus || (defined __STDC__ && __STDC__)
# define __ptr_t void *
#else /* Not C++ or ANSI C. */
# undef const
# define const
# define __ptr_t char *
#endif /* C++ or ANSI C. */
#define __ptr_t void *
#if defined HAVE_STRING_H || defined _LIBC
# include <string.h>

8
string/memrchr.c
View File

@ -1,5 +1,5 @@
/* memrchr -- find the last occurrence of a byte in a memory block
Copyright (C) 1991, 93, 96, 97, 99, 2000 Free Software Foundation, Inc.
Copyright (C) 1991, 93, 96, 97, 99, 2000, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
@ -29,11 +29,7 @@
#endif
#undef __ptr_t
#if defined __cplusplus || (defined __STDC__ && __STDC__)
# define __ptr_t void *
#else /* Not C++ or ANSI C. */
# define __ptr_t char *
#endif /* C++ or ANSI C. */
#define __ptr_t void *
#if defined _LIBC
# include <string.h>

8
string/rawmemchr.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,93,96,97,99,2000,2002 Free Software Foundation, Inc.
/* Copyright (C) 1991,93,96,97,99,2000,2002,2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
@ -26,11 +26,7 @@
#endif
#undef __ptr_t
#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
# define __ptr_t void *
#else /* Not C++ or ANSI C. */
# define __ptr_t char *
#endif /* C++ or ANSI C. */
#define __ptr_t void *
#if defined (_LIBC)
# include <string.h>

6
sysdeps/posix/getcwd.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,93,94,95,96,97,98,99,11 Free Software Foundation, Inc.
/* Copyright (C) 1991-1999,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
@ -192,10 +192,6 @@ extern char *alloca ();
# define size_t unsigned int
#endif
#if !__STDC__ && !defined const
# define const
#endif
#ifndef __GNU_LIBRARY__
# define __lstat64 stat64
#endif

8
time/strftime_l.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2004, 2007-2009, 2010 Free Software Foundation, Inc.
/* Copyright (C) 2002,2004,2007-2009,2010,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
@ -124,11 +124,7 @@ extern char *tzname[];
#endif
#ifndef PTR
# ifdef __STDC__
# define PTR void *
# else
# define PTR char *
# endif
# define PTR void *
#endif
#ifndef CHAR_BIT