From acfa885ff15833047b5bba0ce51be3c84fbd9719 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 5 Nov 2012 13:38:40 +0000 Subject: [PATCH] Fix types of FE_DFL_ENV and FE_NOMASK_ENV (bug 14805). --- ChangeLog | 4 ++++ ports/ChangeLog.arm | 5 +++++ ports/ChangeLog.hppa | 7 +++++++ ports/sysdeps/arm/bits/fenv.h | 2 +- ports/sysdeps/hppa/fpu/bits/fenv.h | 4 ++-- sysdeps/sh/sh4/fpu/bits/fenv.h | 2 +- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fdd4a5a..3ff6937 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-11-05 Joseph Myers + [BZ #14805] + * sysdeps/sh/sh4/fpu/bits/fenv.h (FE_DFL_ENV): Use cast to const + fenv_t *. + [BZ #14801] * sysdeps/s390/fpu/bits/fenv.h (fenv_t): Use implementation namespace for names of struct fields. diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 234883e..c0e9ac2 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,8 @@ +2012-11-05 Joseph Myers + + [BZ #14805] + * sysdeps/arm/bits/fenv.h (FE_DFL_ENV): Use cast to const fenv_t *. + 2012-11-03 Joseph Myers * sysdeps/arm/fclrexcpt.c (feclearexcept): Add libm_hidden_ver. diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa index 3e8d522..201dd01 100644 --- a/ports/ChangeLog.hppa +++ b/ports/ChangeLog.hppa @@ -1,3 +1,10 @@ +2012-11-05 Joseph Myers + + [BZ #14805] + * sysdeps/hppa/fpu/bits/fenv.h (FE_DFL_ENV): Use cast to const + fenv_t *. + (FE_NOMASK_ENV): Likewise. + 2012-11-03 Joseph Myers * sysdeps/hppa/fpu/fclrexcpt.c (feclearexcept): Add diff --git a/ports/sysdeps/arm/bits/fenv.h b/ports/sysdeps/arm/bits/fenv.h index 6788e28..bc4a3ee 100644 --- a/ports/sysdeps/arm/bits/fenv.h +++ b/ports/sysdeps/arm/bits/fenv.h @@ -74,7 +74,7 @@ typedef struct fenv_t; /* If the default argument is used we use this value. */ -#define FE_DFL_ENV ((fenv_t *) -1l) +#define FE_DFL_ENV ((const fenv_t *) -1l) #ifdef __USE_GNU /* Floating-point environment where none of the exceptions are masked. */ diff --git a/ports/sysdeps/hppa/fpu/bits/fenv.h b/ports/sysdeps/hppa/fpu/bits/fenv.h index 0618b1b..49e3018 100644 --- a/ports/sysdeps/hppa/fpu/bits/fenv.h +++ b/ports/sysdeps/hppa/fpu/bits/fenv.h @@ -83,9 +83,9 @@ typedef struct } fenv_t; /* If the default argument is used we use this value. */ -#define FE_DFL_ENV ((fenv_t *) -1) +#define FE_DFL_ENV ((const fenv_t *) -1) #ifdef __USE_GNU /* Floating-point environment where none of the exceptions are masked. */ -# define FE_NOMASK_ENV ((fenv_t *) -2) +# define FE_NOMASK_ENV ((const fenv_t *) -2) #endif diff --git a/sysdeps/sh/sh4/fpu/bits/fenv.h b/sysdeps/sh/sh4/fpu/bits/fenv.h index e51a057..a29edfc 100644 --- a/sysdeps/sh/sh4/fpu/bits/fenv.h +++ b/sysdeps/sh/sh4/fpu/bits/fenv.h @@ -73,4 +73,4 @@ typedef struct fenv_t; /* If the default argument is used we use this value. */ -#define FE_DFL_ENV ((fenv_t *) -1) +#define FE_DFL_ENV ((const fenv_t *) -1) -- 2.7.4