diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-01-26 20:49:22 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-01-26 20:49:22 +0000 |
| commit | 7071ad79db0886c0f17946feea71439400c706a9 (patch) | |
| tree | d792b5885c9c4e7caa46456d22bb819598881a7d /math | |
| parent | 08cf777f9e7f6d826658a99c7d77a359f73a45bf (diff) | |
| download | glibc-7071ad79db0886c0f17946feea71439400c706a9.tar.gz glibc-7071ad79db0886c0f17946feea71439400c706a9.tar.xz glibc-7071ad79db0886c0f17946feea71439400c706a9.zip | |
Remove __STDC__ conditionals from installed headers.
Diffstat (limited to 'math')
| -rw-r--r-- | math/complex.h | 17 | ||||
| -rw-r--r-- | math/math.h | 21 |
2 files changed, 10 insertions, 28 deletions
diff --git a/math/complex.h b/math/complex.h index 9217fddf96..cd48cb9a8d 100644 --- a/math/complex.h +++ b/math/complex.h @@ -82,20 +82,15 @@ __BEGIN_DECLS # define _Mfloat_ float #endif #define _Mdouble_ _Mfloat_ -#ifdef __STDC__ -# define __MATH_PRECNAME(name) name##f -#else -# define __MATH_PRECNAME(name) name/**/f -#endif +#define __MATH_PRECNAME(name) name##f #include <bits/cmathcalls.h> #undef _Mdouble_ #undef __MATH_PRECNAME /* And the long double versions. It is non-critical to define them here unconditionally since `long double' is required in ISO C99. */ -#if (__STDC__ - 0 || __GNUC__ - 0) \ - && (!(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \ - || defined __LDBL_COMPAT) +#if !(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \ + || defined __LDBL_COMPAT # ifdef __LDBL_COMPAT # undef __MATHDECL_1 # define __MATHDECL_1(type, function, args) \ @@ -106,11 +101,7 @@ __BEGIN_DECLS # define _Mlong_double_ long double # endif # define _Mdouble_ _Mlong_double_ -# ifdef __STDC__ -# define __MATH_PRECNAME(name) name##l -# else -# define __MATH_PRECNAME(name) name/**/l -# endif +# define __MATH_PRECNAME(name) name##l # include <bits/cmathcalls.h> #endif #undef _Mdouble_ diff --git a/math/math.h b/math/math.h index a849a03da0..d6e4d01f9d 100644 --- a/math/math.h +++ b/math/math.h @@ -1,5 +1,5 @@ /* Declarations for math functions. - Copyright (C) 1991-1993, 1995-1999, 2001, 2002, 2004, 2006, 2009, 2011 + Copyright (C) 1991-1993, 1995-1999, 2001, 2002, 2004, 2006, 2009, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -84,11 +84,7 @@ __BEGIN_DECLS # define _Mfloat_ float # endif # define _Mdouble_ _Mfloat_ -# ifdef __STDC__ -# define __MATH_PRECNAME(name,r) name##f##r -# else -# define __MATH_PRECNAME(name,r) name/**/f/**/r -# endif +# define __MATH_PRECNAME(name,r) name##f##r # define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_C99 # define _Mdouble_END_NAMESPACE __END_NAMESPACE_C99 # include <bits/mathcalls.h> @@ -97,9 +93,8 @@ __BEGIN_DECLS # undef _Mdouble_END_NAMESPACE # undef __MATH_PRECNAME -# if (__STDC__ - 0 || __GNUC__ - 0) \ - && (!(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \ - || defined __LDBL_COMPAT) +# if !(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \ + || defined __LDBL_COMPAT # ifdef __LDBL_COMPAT # ifdef __USE_ISOC99 @@ -132,11 +127,7 @@ extern long double __REDIRECT_NTH (nexttowardl, # define _Mlong_double_ long double # endif # define _Mdouble_ _Mlong_double_ -# ifdef __STDC__ -# define __MATH_PRECNAME(name,r) name##l##r -# else -# define __MATH_PRECNAME(name,r) name/**/l/**/r -# endif +# define __MATH_PRECNAME(name,r) name##l##r # define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_C99 # define _Mdouble_END_NAMESPACE __END_NAMESPACE_C99 # define __MATH_DECLARE_LDOUBLE 1 @@ -146,7 +137,7 @@ extern long double __REDIRECT_NTH (nexttowardl, # undef _Mdouble_END_NAMESPACE # undef __MATH_PRECNAME -# endif /* __STDC__ || __GNUC__ */ +# endif /* !(__NO_LONG_DOUBLE_MATH && _LIBC) || __LDBL_COMPAT */ #endif /* Use misc or ISO C99. */ #undef __MATHDECL_1 |