From 7071ad79db0886c0f17946feea71439400c706a9 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 26 Jan 2012 20:49:22 +0000 Subject: Remove __STDC__ conditionals from installed headers. --- sysdeps/generic/_G_config.h | 6 +----- sysdeps/gnu/_G_config.h | 6 +----- sysdeps/mach/hurd/_G_config.h | 6 +----- sysdeps/powerpc/bits/mathdef.h | 14 ++------------ sysdeps/sh/sh4/bits/mathdef.h | 15 +++------------ sysdeps/sparc/bits/mathdef.h | 12 ++---------- 6 files changed, 10 insertions(+), 49 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h index 4aafe65f6b..67b8dcdd10 100644 --- a/sysdeps/generic/_G_config.h +++ b/sysdeps/generic/_G_config.h @@ -84,10 +84,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__))); #define _G_VTABLE_LABEL_HAS_LENGTH 1 -#if defined __cplusplus || defined __STDC__ -# define _G_ARGS(ARGLIST) ARGLIST -#else -# define _G_ARGS(ARGLIST) () -#endif +#define _G_ARGS(ARGLIST) ARGLIST #endif /* _G_config.h */ diff --git a/sysdeps/gnu/_G_config.h b/sysdeps/gnu/_G_config.h index 211d0224b1..fe43f8c894 100644 --- a/sysdeps/gnu/_G_config.h +++ b/sysdeps/gnu/_G_config.h @@ -92,10 +92,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__))); #define _G_VTABLE_LABEL_PREFIX_ID __vt_ -#if defined __cplusplus || defined __STDC__ -# define _G_ARGS(ARGLIST) ARGLIST -#else -# define _G_ARGS(ARGLIST) () -#endif +#define _G_ARGS(ARGLIST) ARGLIST #endif /* _G_config.h */ diff --git a/sysdeps/mach/hurd/_G_config.h b/sysdeps/mach/hurd/_G_config.h index db959246ee..8c685619fe 100644 --- a/sysdeps/mach/hurd/_G_config.h +++ b/sysdeps/mach/hurd/_G_config.h @@ -91,10 +91,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__))); #define _G_VTABLE_LABEL_PREFIX_ID __vt_ -#if defined __cplusplus || defined __STDC__ -# define _G_ARGS(ARGLIST) ARGLIST -#else -# define _G_ARGS(ARGLIST) () -#endif +#define _G_ARGS(ARGLIST) ARGLIST #endif /* _G_config.h */ diff --git a/sysdeps/powerpc/bits/mathdef.h b/sysdeps/powerpc/bits/mathdef.h index 7723f0caaf..3a9b1b0459 100644 --- a/sysdeps/powerpc/bits/mathdef.h +++ b/sysdeps/powerpc/bits/mathdef.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997,1998,1999,2000,2003,2004,2006,2010 +/* Copyright (C) 1997,1998,1999,2000,2003,2004,2006,2010,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -32,23 +32,13 @@ # define _MATH_H_MATHDEF 1 # ifdef __GNUC__ -# if __STDC__ == 1 -/* In GNU or ANSI mode, gcc leaves `float' expressions as-is. */ +/* gcc leaves `float' expressions as-is. */ typedef float float_t; /* `float' expressions are evaluated as `float'. */ typedef double double_t; /* `double' expressions are evaluated as `double'. */ -# else - -/* For `gcc -traditional', `float' expressions are evaluated as `double'. */ -typedef double float_t; /* `float' expressions are evaluated as - `double'. */ -typedef double double_t; /* `double' expressions are evaluated as - `double'. */ - -# endif # else /* Wild guess at types for float_t and double_t. */ diff --git a/sysdeps/sh/sh4/bits/mathdef.h b/sysdeps/sh/sh4/bits/mathdef.h index 2b8caf1943..5b92234983 100644 --- a/sysdeps/sh/sh4/bits/mathdef.h +++ b/sysdeps/sh/sh4/bits/mathdef.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999, 2000, 2004, 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 @@ -31,23 +32,13 @@ # define _MATH_H_MATHDEF 1 # ifdef __GNUC__ -# if __STDC__ == 1 -/* In GNU or ANSI mode, gcc leaves `float' expressions as-is. */ +/* gcc leaves `float' expressions as-is. */ typedef float float_t; /* `float' expressions are evaluated as `float'. */ typedef double double_t; /* `double' expressions are evaluated as `double'. */ -# else - -/* For `gcc -traditional', `float' expressions are evaluated as `double'. */ -typedef double float_t; /* `float' expressions are evaluated as - `double'. */ -typedef double double_t; /* `double' expressions are evaluated as - `double'. */ - -# endif # else /* Wild guess at types for float_t and double_t. */ diff --git a/sysdeps/sparc/bits/mathdef.h b/sysdeps/sparc/bits/mathdef.h index c8dcc9c93f..042c9c881b 100644 --- a/sysdeps/sparc/bits/mathdef.h +++ b/sysdeps/sparc/bits/mathdef.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999, 2000, 2004, 2006 +/* Copyright (C) 1997, 1998, 1999, 2000, 2004, 2006, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -30,19 +30,11 @@ # define _MATH_H_MATHDEF 1 # ifdef __GNUC__ -# if __STDC__ == 1 -/* In GNU or ANSI mode, gcc leaves `float' expressions as-is. */ +/* gcc leaves `float' expressions as-is. */ typedef float float_t; typedef double double_t; -# else - -/* For `gcc -traditional', `float' expressions are evaluated as `double'. */ -typedef double float_t; -typedef double double_t; - -# endif # else /* Wild guess at types for float_t and double_t. */ -- cgit v1.2.3