about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGabriel F. T. Gomes <gftg@linux.vnet.ibm.com>2017-03-31 09:31:10 -0300
committerGabriel F. T. Gomes <gftg@linux.vnet.ibm.com>2017-03-31 14:50:00 -0300
commit1361e98d5602e8b78cca019952d4a3438d68a239 (patch)
tree236b10995536f0c57829372c8703e64aba42b9ef
parentce39613205dc47ceaeea76710d49e7a483b503ab (diff)
downloadglibc-1361e98d5602e8b78cca019952d4a3438d68a239.tar.gz
glibc-1361e98d5602e8b78cca019952d4a3438d68a239.tar.xz
glibc-1361e98d5602e8b78cca019952d4a3438d68a239.zip
Fix condition for inclusion of math-finite.h for long double
The condition for declaration of long double functions in
math-finite.h was #ifdef __MATH_DECLARE_LDOUBLE before the
macroization of this file.  After the macroization, it was incorreclty
changed to #if __MATH_DECLARE_LDOUBLE, which broke the build for arm.

	* math/math.h: Fix check for __MATH_DECLARE_LDOUBLE.
	* math/bits/math-finite.h: Likewise.
-rw-r--r--ChangeLog5
-rw-r--r--math/bits/math-finite.h2
-rw-r--r--math/math.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a393a015d..b5d380e65f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-31  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
+
+	* math/math.h: Fix check for __MATH_DECLARE_LDOUBLE.
+	* math/bits/math-finite.h: Likewise.
+
 2017-03-31  Slava Barinov  <v.barinov@samsung.com>
 
 	[BZ #21289]
diff --git a/math/bits/math-finite.h b/math/bits/math-finite.h
index 59cd06b866..29f2f2ed43 100644
--- a/math/bits/math-finite.h
+++ b/math/bits/math-finite.h
@@ -177,7 +177,7 @@ __MATH_REDIRCALL (remainder, , (_Mdouble_, _Mdouble_));
 #if (__MATH_DECLARING_DOUBLE \
      && (defined __USE_MISC \
 	 || (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8))) \
-    || (!__MATH_DECLARE_LDOUBLE && defined __USE_MISC)
+    || (!defined __MATH_DECLARE_LDOUBLE && defined __USE_MISC)
 /* scalb.  */
 __MATH_REDIRCALL (scalb, , (_Mdouble_, _Mdouble_));
 #endif
diff --git a/math/math.h b/math/math.h
index 0c19d450ee..cfaed0ed98 100644
--- a/math/math.h
+++ b/math/math.h
@@ -588,7 +588,7 @@ extern int matherr (struct exception *__exc);
 #  undef _MSUF_
 
 /* Include bits/math-finite.h for long double.  */
-#  if __MATH_DECLARE_LDOUBLE
+#  ifdef __MATH_DECLARE_LDOUBLE
 #   define _Mdouble_ long double
 #   define __MATH_DECLARING_DOUBLE 0
 #   define __MATH_DECLARING_LDOUBLE 1