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.

diff --git a/ChangeLog b/ChangeLog
index 3a393a015d1919991147be7b3cbcd069e566f125..b5d380e65ff12b18d4b2d10af27c73dc974e398f 100644 (file)
--- 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 59cd06b86671c3c70ef26836448acd7422143f32..29f2f2ed43f2aaf65d4c321f7eb8e7dd964403fd 100644 (file)
--- 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 0c19d450eeddd0f8406b7492e48a639dfee1387d..cfaed0ed98013830421afdf1ba6f13c01702831d 100644 (file)
--- 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