Remove __STDC__ conditionals from non-installed headers.

diff --git a/ChangeLog b/ChangeLog
index 4fa37ca4ec3f5d2f90de8908e0a87a331c74c2d1..24c9550af2d94bd441c27fa463d92d6074a435bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-26  Joseph Myers  <joseph@codesourcery.com>
+
+       * crypt/md5.h: Remove __STDC__ conditionals.
+       * libio/libioP.h: Likewise.
+       * locale/programs/config.h: Likewise.
+       * sysdeps/generic/sysdep.h: Likewise.
+       * sysdeps/i386/asm-syntax.h: Likewise.
+       * sysdeps/s390/asm-syntax.h: Likewise.
+       * sysdeps/unix/sysdep.h: Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise.
+
 2012-01-26  Joseph Myers  <joseph@codesourcery.com>
 
        * libio/libio.h: Remove __STDC__ conditionals.

diff --git a/crypt/md5.h b/crypt/md5.h
index 64a73bdc8370e6769fafde05559f32fe0f9b0bf0..21cfc5df259b9803c395d9982ff1531e01843fce 100644 (file)
--- a/crypt/md5.h
+++ b/crypt/md5.h
@@ -1,6 +1,6 @@
 /* Declaration of functions and data types used for MD5 sum computing
    library functions.
-   Copyright (C) 1995-1997,1999,2000,2001,2004,2005,2011
+   Copyright (C) 1995-1997,1999,2000,2001,2004,2005,2011,2012
       Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -43,11 +43,7 @@
 typedef uint32_t md5_uint32;
 typedef uintptr_t md5_uintptr;
 #else
-# if defined __STDC__ && __STDC__
-#  define UINT_MAX_32_BITS 4294967295U
-# else
-#  define UINT_MAX_32_BITS 0xFFFFFFFF
-# endif
+# define UINT_MAX_32_BITS 4294967295U
 
 /* If UINT_MAX isn't defined, assume it's a 32-bit type.
    This should be valid for all systems GNU cares about because

diff --git a/libio/libioP.h b/libio/libioP.h
index 9bbdd28f615e7bdbae76ed50118e14112911e4ba..305a6e3fff05d5adb18dbcc478d53d0747e12582 100644 (file)
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -927,11 +927,7 @@ VTABLE_LABEL(builtinbuf_vtable, builtinbuf, 10)
 # endif
 #endif /* !defined(builtinbuf_vtable) && defined(__cplusplus) */
 
-#if defined(__STDC__) || defined(__cplusplus)
-# define _IO_va_start(args, last) va_start(args, last)
-#else
-# define _IO_va_start(args, last) va_start(args)
-#endif
+#define _IO_va_start(args, last) va_start(args, last)
 
 extern struct _IO_fake_stdiobuf _IO_stdin_buf, _IO_stdout_buf, _IO_stderr_buf;
 

diff --git a/locale/programs/config.h b/locale/programs/config.h
index 2f66997abebfcff65439b72dda668464dbac4b32..606aa02cbfe01621b13f2bcf5df27db46f5d5285 100644 (file)
--- a/locale/programs/config.h
+++ b/locale/programs/config.h
@@ -1,5 +1,5 @@
 /* Configuration for localedef program.
-   Copyright (C) 1995,1996,1997,1998,2000,2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998,2000,2005,2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
@@ -30,11 +30,7 @@
 #define DEFAULT_CHARMAP "ANSI_X3.4-1968" /* ASCII */
 
 #ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
+# define PARAMS(args) args
 #endif
 
 /* This must be one higer than the last used LC_xxx category value.  */

diff --git a/sysdeps/generic/sysdep.h b/sysdeps/generic/sysdep.h
index d1fec5456e82fdf7c9705946d9960c317aa9e869..c844aad031b151789f45f54e639254809a6338a1 100644 (file)
--- a/sysdeps/generic/sysdep.h
+++ b/sysdeps/generic/sysdep.h
@@ -21,11 +21,7 @@
 #ifndef C_LABEL
 
 /* Define a macro we can use to construct the asm name for a C symbol.  */
-# ifdef __STDC__
-#  define C_LABEL(name)        name##:
-# else
-#  define C_LABEL(name)        name/**/:
-# endif
+# define C_LABEL(name) name##:
 
 #endif
 

diff --git a/sysdeps/i386/asm-syntax.h b/sysdeps/i386/asm-syntax.h
index 19510e01b594922778f1d9c55127e60d40608405..4b9fd20d0de026c7bbf08a48a261955282080b09 100644 (file)
--- a/sysdeps/i386/asm-syntax.h
+++ b/sysdeps/i386/asm-syntax.h
@@ -23,15 +23,7 @@
 
 #undef L
 #ifdef __ELF__
-# ifdef __STDC__
-#  define L(body) .L##body
-# else
-#  define L(body) .L/**/body
-# endif
+# define L(body) .L##body
 #else
-# ifdef __STDC__
-#  define L(body) L##body
-# else
-#  define L(body) L/**/body
-# endif
+# define L(body) L##body
 #endif

diff --git a/sysdeps/s390/asm-syntax.h b/sysdeps/s390/asm-syntax.h
index a1d7b5e74b431422c5e3b2a7314a4fb6493ca384..98dc6e866e44b69e0a76c42a7afa3adcec8b1e61 100644 (file)
--- a/sysdeps/s390/asm-syntax.h
+++ b/sysdeps/s390/asm-syntax.h
@@ -23,15 +23,7 @@
 
 #undef L
 #ifdef __ELF__
-# ifdef __STDC__
-#  define L(body) .L##body
-# else
-#  define L(body) .L/**/body
-# endif
+# define L(body) .L##body
 #else
-# ifdef __STDC__
-#  define L(body) L##body
-# else
-#  define L(body) L/**/body
-# endif
+# define L(body) L##body
 #endif

diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h
index 11e5317dfffdffd9ebc5ca2091d701b99be98b31..e8c1ec8e24a6a156b3fa4b39225be484f9a707f8 100644 (file)
--- a/sysdeps/unix/sysdep.h
+++ b/sysdeps/unix/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 96, 98, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993, 96, 98, 2003, 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
@@ -22,11 +22,7 @@
 #define        HAVE_SYSCALLS
 
 /* Note that using a `PASTE' macro loses.  */
-#ifdef __STDC__
 #define        SYSCALL__(name, args)   PSEUDO (__##name, name, args)
-#else
-#define        SYSCALL__(name, args)   PSEUDO (__/**/name, name, args)
-#endif
 #define        SYSCALL(name, args)     PSEUDO (name, name, args)
 
 /* Machine-dependent sysdep.h files are expected to define the macro
@@ -36,11 +32,7 @@
    an instruction such that "MOVE(r1, r0)" works.  ret should be defined
    as the return instruction.  */
 
-#ifdef __STDC__
 #define SYS_ify(syscall_name) SYS_##syscall_name
-#else
-#define SYS_ify(syscall_name) SYS_/**/syscall_name
-#endif
 
 /* Terminate a system call named SYM.  This is used on some platforms
    to generate correct debugging information.  */

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
index c42efbabdd918c8a5dd411904b29855613744784..322e43b61c5d82ff36d6100c77291b2eeb9e2079 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1997-2003,2004,2005,2006 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1997-2006,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
@@ -45,11 +45,7 @@
    of the kernel.  But these symbols do not follow the SYS_* syntax
    so we have to redefine the `SYS_ify' macro here.  */
 #undef SYS_ify
-#ifdef __STDC__
-# define SYS_ify(syscall_name) __NR_##syscall_name
-#else
-# define SYS_ify(syscall_name) __NR_/**/syscall_name
-#endif
+#define SYS_ify(syscall_name)  __NR_##syscall_name
 
 #ifndef __ASSEMBLER__
 

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
index e714c4c534e1b092e3478f429acd40c7ff964845..31a077dbf5e7ce5b984a38c7bc0b60e275619a27 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006
+/* Copyright (C) 1992,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2012
        Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -53,11 +53,7 @@
    of the kernel.  But these symbols do not follow the SYS_* syntax
    so we have to redefine the `SYS_ify' macro here.  */
 #undef SYS_ify
-#ifdef __STDC__
-# define SYS_ify(syscall_name) __NR_##syscall_name
-#else
-# define SYS_ify(syscall_name) __NR_/**/syscall_name
-#endif
+#define SYS_ify(syscall_name)  __NR_##syscall_name
 
 #ifdef __ASSEMBLER__