From 0155d5b26e32b2012d9f1842c3b06324746d3087 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 2 Nov 2012 22:11:21 +0000 Subject: Make math.h FP_* macros usable in #if (bug 3439). --- ChangeLog | 10 ++++++++++ math/math.h | 25 +++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 798a816eba..c84a492cf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-11-02 Joseph Myers + + [BZ #3439] + * math/math.h (FP_NAN): Define macro to integer constant usable in + #if and use that to give value to enum constant. + (FP_INFINITE): Likewise. + (FP_ZERO): Likewise. + (FP_SUBNORMAL): Likewise. + (FP_NORMAL): Likewise. + 2012-11-02 Andreas Schwab * iconvdata/bug-iconv8.c (do_test): Use %z for size_t arguments. diff --git a/math/math.h b/math/math.h index bcdd5c9c74..0b4bc0ce6d 100644 --- a/math/math.h +++ b/math/math.h @@ -189,16 +189,21 @@ extern int signgam; /* All floating-point numbers can be put in one of these categories. */ enum { - FP_NAN, -# define FP_NAN FP_NAN - FP_INFINITE, -# define FP_INFINITE FP_INFINITE - FP_ZERO, -# define FP_ZERO FP_ZERO - FP_SUBNORMAL, -# define FP_SUBNORMAL FP_SUBNORMAL - FP_NORMAL -# define FP_NORMAL FP_NORMAL + FP_NAN = +# define FP_NAN 0 + FP_NAN, + FP_INFINITE = +# define FP_INFINITE 1 + FP_INFINITE, + FP_ZERO = +# define FP_ZERO 2 + FP_ZERO, + FP_SUBNORMAL = +# define FP_SUBNORMAL 3 + FP_SUBNORMAL, + FP_NORMAL = +# define FP_NORMAL 4 + FP_NORMAL }; /* Return number of classification appropriate for X. */ -- cgit 1.4.1