From 913a0f6c362c8c9aac72f800485678845a60ed06 Mon Sep 17 00:00:00 2001
From: joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>
Date: Thu, 17 Nov 2011 21:56:08 +0000
Subject: Merge changes between r15584 and r15868 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@15869 7b3dc134-2b1b-0410-93df-9e9f96275f8d
---
 libc/math/complex.h     | 7 +++----
 libc/math/libm-test.inc | 1 +
 libc/math/math.h        | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libc/math')

diff --git a/libc/math/complex.h b/libc/math/complex.h
index 7e22fc9ab..a2fe0e178 100644
--- a/libc/math/complex.h
+++ b/libc/math/complex.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000, 2006, 2011 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
@@ -85,9 +85,8 @@ __BEGIN_DECLS
 /* 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 __LDBL_COMPAT \
-        || !defined _LIBC)
+    && (!(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \
+	|| defined __LDBL_COMPAT)
 # if defined __LDBL_COMPAT || defined __NO_LONG_DOUBLE_MATH
 #  undef __MATHDECL_1
 #  define __MATHDECL_1(type, function, args) \
diff --git a/libc/math/libm-test.inc b/libc/math/libm-test.inc
index f1ecdcd78..d07ab6c48 100644
--- a/libc/math/libm-test.inc
+++ b/libc/math/libm-test.inc
@@ -5655,6 +5655,7 @@ sin_test (void)
 
 #ifdef TEST_DOUBLE
   TEST_f_f (sin, 0.80190127184058835, 0.71867942238767868);
+  TEST_f_f (sin, 2.522464e-1, 2.4957989804940911e-1);
 #endif
 
   END (sin);
diff --git a/libc/math/math.h b/libc/math/math.h
index 7b5988114..52c23537d 100644
--- a/libc/math/math.h
+++ b/libc/math/math.h
@@ -98,9 +98,8 @@ __BEGIN_DECLS
 # undef	__MATH_PRECNAME
 
 # if (__STDC__ - 0 || __GNUC__ - 0) \
-     && (!defined __NO_LONG_DOUBLE_MATH \
-	 || defined __LDBL_COMPAT \
-	 || !defined _LIBC)
+     && (!(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \
+	 || defined __LDBL_COMPAT)
 #  ifdef __LDBL_COMPAT
 
 #   ifdef __USE_ISOC99
@@ -131,6 +130,7 @@ extern long double __REDIRECT_NTH (nexttowardl,
 
 /* Include the file of declarations again, this time using `long double'
    instead of `double' and appending l to each function name.  */
+
 #  ifndef _Mlong_double_
 #   define _Mlong_double_	long double
 #  endif
-- 
cgit v1.2.3