From: Gabriel F. T. Gomes Date: Fri, 31 Mar 2017 12:31:10 +0000 (-0300) Subject: Fix condition for inclusion of math-finite.h for long double X-Git-Tag: glibc-2.26~661 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1361e98d5602e8b78cca019952d4a3438d68a239;p=thirdparty%2Fglibc.git 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 3a393a015d1..b5d380e65ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-03-31 Gabriel F. T. Gomes + + * math/math.h: Fix check for __MATH_DECLARE_LDOUBLE. + * math/bits/math-finite.h: Likewise. + 2017-03-31 Slava Barinov [BZ #21289] diff --git a/math/bits/math-finite.h b/math/bits/math-finite.h index 59cd06b8667..29f2f2ed43f 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 0c19d450eed..cfaed0ed980 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