This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Remove __STDC__ conditionals from installed headers
This is the patch I plan to apply to remove __STDC__ conditionals in
non-installed headers. Again, it's conservative about fixing only one
thing at a time: some headers have __ELF__ conditionals that can also
now safely be removed, but this patch deals with __STDC__ only.
The only file here that's used outside of glibc is md5.h, used in
gnulib; again, gnulib requires at least a C89 compiler (and it looks
like has larger changes to this file that should be merged back to
glibc). (In general, for source files used by gnulib I think the
ideal state would be that any required differences are conditioned on
_LIBC, so the versions in the two repositories can be identical except
for the changes gnulib makes to copyright/license headers and gnulib's
use of spaces instead of tabs for indentation. For headers glibc
installs and gnulib also uses, there may be a bit more complication to
keep the header namespace-clean when installed by glibc, but
divergence should still be kept down. That does however rely on
changes made in gnulib being contributed to glibc.)
I ignored headers originating outside glibc (GMP - probably no real
point trying to update those files from upstream - and gettext - where
we probably should update libintl from upstream, but avoid unnecessary
local changes).
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.
diff --git a/crypt/md5.h b/crypt/md5.h
index 64a73bd..21cfc5d 100644
--- 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 9bbdd28..305a6e3 100644
--- 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 2f66997..606aa02 100644
--- 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 d1fec54..c844aad 100644
--- 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 19510e0..4b9fd20 100644
--- 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 a1d7b5e..98dc6e8 100644
--- 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 11e5317..e8c1ec8 100644
--- 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 c42efba..322e43b 100644
--- 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 e714c4c..31a077d 100644
--- 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__
--
Joseph S. Myers
joseph@codesourcery.com