diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-27 11:25:41 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-27 11:25:41 -0500 |
| commit | 43455e09166350b1237d2168d1b008c9f47ebaf0 (patch) | |
| tree | 42390fa1645e01c728923b9874cc61a35823cffd /math/complex.h | |
| parent | 6ac2f2df75d3b48ab502f0b0275b7e838e90c0b1 (diff) | |
| parent | 965a54a4eecc6cf5c53718f07290171f744c4d6c (diff) | |
| download | glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.xz glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Diffstat (limited to 'math/complex.h')
| -rw-r--r-- | math/complex.h | 17 |
1 files changed, 4 insertions, 13 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_ |