summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2013-05-17 23:50:11 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2013-05-17 23:50:11 +0000
commit037ebec6461ad978f9a2f44ca49f1d7d7b858e2d (patch)
treeb2165b971c6ed0fd80ea808bf92664db63f4474c
parentc19459a92177fc8864b461e84d017a21c4006dc5 (diff)
downloadeglibc2-037ebec6461ad978f9a2f44ca49f1d7d7b858e2d.tar.gz
* math/complex.h, math/math.h: Revert differences from glibc.
git-svn-id: svn://svn.eglibc.org/trunk@23089 7b3dc134-2b1b-0410-93df-9e9f96275f8d
-rw-r--r--libc/ChangeLog.eglibc4
-rw-r--r--libc/math/complex.h2
-rw-r--r--libc/math/math.h3
3 files changed, 5 insertions, 4 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc
index e607d5331..575eb6033 100644
--- a/libc/ChangeLog.eglibc
+++ b/libc/ChangeLog.eglibc
@@ -1,3 +1,7 @@
+2013-05-17 Joseph Myers <joseph@codesourcery.com>
+
+ * math/complex.h, math/math.h: Revert differences from glibc.
+
2012-11-17 Joseph Myers <joseph@codesourcery.com>
* sunrpc/proto.h [IS_in_build] (REPORT_BUGS_TO): Remove.
diff --git a/libc/math/complex.h b/libc/math/complex.h
index 3b0d45d7a..5bdcc93f9 100644
--- a/libc/math/complex.h
+++ b/libc/math/complex.h
@@ -90,7 +90,7 @@ __BEGIN_DECLS
here unconditionally since `long double' is required in ISO C99. */
#if !(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \
|| defined __LDBL_COMPAT
-# if defined __LDBL_COMPAT || defined __NO_LONG_DOUBLE_MATH
+# ifdef __LDBL_COMPAT
# undef __MATHDECL_1
# define __MATHDECL_1(type, function, args) \
extern type __REDIRECT_NTH(__MATH_PRECNAME(function), args, function)
diff --git a/libc/math/math.h b/libc/math/math.h
index 28c216a00..e3adf096a 100644
--- a/libc/math/math.h
+++ b/libc/math/math.h
@@ -109,9 +109,6 @@ extern long double __REDIRECT_NTH (nexttowardl,
nextafter) __attribute__ ((__const__));
# endif
# endif
-# endif
-
-# if defined __LDBL_COMPAT || defined __NO_LONG_DOUBLE_MATH
# undef __MATHDECL_1
# define __MATHDECL_2(type, function,suffix, args, alias) \