[commits] r9306 - in /branches/eglibc-2_11/libc: ChangeLog.eglibc math/complex.h math/math.h

[maxim@xxxxxxxxxx]

Author: maxim
Date: Fri Nov 20 00:02:52 2009
New Revision: 9306

Log:
	Backport from trunk:

	2009-11-20  Jakub Jelinek  <jakub@xxxxxxxxxx>
	PR libc/10103
	* math/math.h: Provide *l long double prototypes redirecting
	to double functions even when __NO_LONG_DOUBLE_MATH and not
	__LDBL_COMPAT.
	* math/complex.h: Likewise.

Modified:
    branches/eglibc-2_11/libc/ChangeLog.eglibc
    branches/eglibc-2_11/libc/math/complex.h
    branches/eglibc-2_11/libc/math/math.h

Modified: branches/eglibc-2_11/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_11/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_11/libc/ChangeLog.eglibc Fri Nov 20 00:02:52 2009
@@ -1,3 +1,14 @@
+2009-11-20  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+
+	Backport from trunk:
+
+	2009-11-20  Jakub Jelinek  <jakub@xxxxxxxxxx>
+	PR libc/10103
+	* math/math.h: Provide *l long double prototypes redirecting
+	to double functions even when __NO_LONG_DOUBLE_MATH and not
+	__LDBL_COMPAT.
+	* math/complex.h: Likewise.
+
 2009-11-11  Thomas Schwinge  <thomas@xxxxxxxxxxxxxxxx>
 
 	* configure.in (libc_cv_ssp): Make this a compile-time check.  Avoid

Modified: branches/eglibc-2_11/libc/math/complex.h
==============================================================================
--- branches/eglibc-2_11/libc/math/complex.h (original)
+++ branches/eglibc-2_11/libc/math/complex.h Fri Nov 20 00:02:52 2009
@@ -85,8 +85,10 @@
 /* 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)
-# ifdef __LDBL_COMPAT
+    && (!defined __NO_LONG_DOUBLE_MATH \
+        || defined __LDBL_COMPAT \
+        || !defined _LIBC)
+# if defined __LDBL_COMPAT || defined __NO_LONG_DOUBLE_MATH
 #  undef __MATHDECL_1
 #  define __MATHDECL_1(type, function, args) \
   extern type __REDIRECT_NTH(__MATH_PRECNAME(function), args, function)

Modified: branches/eglibc-2_11/libc/math/math.h
==============================================================================
--- branches/eglibc-2_11/libc/math/math.h (original)
+++ branches/eglibc-2_11/libc/math/math.h Fri Nov 20 00:02:52 2009
@@ -98,7 +98,9 @@
 # undef	__MATH_PRECNAME
 
 # if (__STDC__ - 0 || __GNUC__ - 0) \
-     && (!defined __NO_LONG_DOUBLE_MATH || defined __LDBL_COMPAT)
+     && (!defined __NO_LONG_DOUBLE_MATH \
+	 || defined __LDBL_COMPAT \
+	 || !defined _LIBC)
 #  ifdef __LDBL_COMPAT
 
 #   ifdef __USE_ISOC99
@@ -115,9 +117,9 @@
 				   nextafter) __attribute__ ((__const__));
 #    endif
 #   endif
-
-/* Include the file of declarations again, this time using `long double'
-   instead of `double' and appending l to each function name.  */
+#  endif
+
+#  if defined __LDBL_COMPAT || defined __NO_LONG_DOUBLE_MATH
 
 #   undef __MATHDECL_1
 #   define __MATHDECL_2(type, function,suffix, args, alias) \
@@ -127,6 +129,8 @@
   __MATHDECL_2(type, function,suffix, args, __CONCAT(function,suffix))
 #  endif
 
+/* 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
@@ -140,8 +144,8 @@
 #  define _Mdouble_END_NAMESPACE   __END_NAMESPACE_C99
 #  include <bits/mathcalls.h>
 #  undef _Mdouble_
-# undef _Mdouble_BEGIN_NAMESPACE
-# undef _Mdouble_END_NAMESPACE
+#  undef _Mdouble_BEGIN_NAMESPACE
+#  undef _Mdouble_END_NAMESPACE
 #  undef __MATH_PRECNAME
 
 # endif /* __STDC__ || __GNUC__ */