From d3cbb9807c3b99c762c1661c2ec2345d0b574089 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 23 May 1999 09:44:56 +0000 Subject: [PATCH] (fenv_t): Prepend __ to member names to protect from user's macro namespace. --- sysdeps/arm/fpu/bits/fenv.h | 10 +++++----- sysdeps/mips/bits/fenv.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sysdeps/arm/fpu/bits/fenv.h b/sysdeps/arm/fpu/bits/fenv.h index ca06196..3c9e286 100644 --- a/sysdeps/arm/fpu/bits/fenv.h +++ b/sysdeps/arm/fpu/bits/fenv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #endif /* Define bits representing exceptions in the FPU status word. */ -enum +enum { FE_INVALID = 1, #define FE_INVALID FE_INVALID @@ -34,7 +34,7 @@ enum }; /* Amount to shift by to convert an exception to a mask bit. */ -#define FE_EXCEPT_SHIFT 16 +#define FE_EXCEPT_SHIFT 16 /* All supported exceptions. */ #define FE_ALL_EXCEPT \ @@ -45,12 +45,12 @@ enum #define FE_TONEAREST 0 /* Type representing exception flags. */ -typedef unsigned long fexcept_t; +typedef unsigned long int fexcept_t; /* Type representing floating-point environment. */ typedef struct { - unsigned long cw; + unsigned long int __cw; } fenv_t; diff --git a/sysdeps/mips/bits/fenv.h b/sysdeps/mips/bits/fenv.h index 0637bf7..efa90b6 100644 --- a/sysdeps/mips/bits/fenv.h +++ b/sysdeps/mips/bits/fenv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -64,7 +64,7 @@ typedef unsigned short int fexcept_t; to the layout of the block written by the `fstenv'. */ typedef struct { - unsigned int fp_control_register; + unsigned int __fp_control_register; } fenv_t; -- 2.7.4