aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-02-01 19:45:29 +0000
committerRoland McGrath <roland@gnu.org>2006-02-01 19:45:29 +0000
commitd36421fa255cdd931c18ad03cfda435e7897ef10 (patch)
tree96984558162d343e581c0111e619b240e9661b43
parent9d4c4f44768afda6f527c35959fbf339c508a035 (diff)
downloadglibc-d36421fa255cdd931c18ad03cfda435e7897ef10.tar
glibc-d36421fa255cdd931c18ad03cfda435e7897ef10.tar.gz
glibc-d36421fa255cdd931c18ad03cfda435e7897ef10.tar.bz2
glibc-d36421fa255cdd931c18ad03cfda435e7897ef10.zip
* math/bits/mathcalls.h: Guard __END_NAMESPACE_C99 with the
same #if condition as corresponding __BEGIN_NAMESPACE_C99. (scalb): Don't define only if __USE_ISOC99.
-rw-r--r--ChangeLog4
-rw-r--r--math/bits/mathcalls.h9
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d0d6db4c36..019c3a8ace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2006-02-01 Jakub Jelinek <jakub@redhat.com>
+ * math/bits/mathcalls.h: Guard __END_NAMESPACE_C99 with the
+ same #if condition as corresponding __BEGIN_NAMESPACE_C99.
+ (scalb): Don't define only if __USE_ISOC99.
+
* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
index 174fe34589..64da6276f6 100644
--- a/math/bits/mathcalls.h
+++ b/math/bits/mathcalls.h
@@ -353,10 +353,13 @@ __MATHDECL_1 (int, __signbit,, (_Mdouble_ __value))
/* Multiply-add function computed as a ternary operation. */
__MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
+#endif /* Use ISO C99. */
+
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
__END_NAMESPACE_C99
+#endif
-# if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
/* Return X times (2 to the Nth power). */
__MATHCALL (scalb,, (_Mdouble_ __x, _Mdouble_ __n));
-# endif
-#endif /* Use ISO C99. */
+#endif