4 files changed, 11 insertions, 11 deletions
diff --git a/sysdeps/arm/fpu/bits/fenv.h b/sysdeps/arm/fpu/bits/fenv.h
index ca06196dda..3c9e2861c7 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/arm/fpu/fegetenv.c b/sysdeps/arm/fpu/fegetenv.c
index 5b31c5e644..99dc1f0d8c 100644
--- a/sysdeps/arm/fpu/fegetenv.c
+++ b/sysdeps/arm/fpu/fegetenv.c
@@ -1,5 +1,5 @@
 /* Store current floating-point environment.
-   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
@@ -25,5 +25,5 @@ fegetenv (fenv_t *envp)
 {
   unsigned long int temp;
   _FPU_GETCW(temp);
-  envp->cw = temp;
+  envp->__cw = temp;
 }
diff --git a/sysdeps/arm/fpu/feholdexcpt.c b/sysdeps/arm/fpu/feholdexcpt.c
index 5679ccc243..3faabd90eb 100644
--- a/sysdeps/arm/fpu/feholdexcpt.c
+++ b/sysdeps/arm/fpu/feholdexcpt.c
@@ -1,5 +1,5 @@
 /* Store current floating-point environment and clear exceptions.
-   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
@@ -27,7 +27,7 @@ feholdexcept (fenv_t *envp)
 
   /* Store the environment.  */
   _FPU_GETCW(temp);
-  envp->cw = temp;
+  envp->__cw = temp;
 
   /* Now set all exceptions to non-stop.  */
   temp &= ~(FE_ALL_EXCEPT << FE_EXCEPT_SHIFT);
diff --git a/sysdeps/arm/fpu/fesetenv.c b/sysdeps/arm/fpu/fesetenv.c
index b2d3ec5e9f..7f3a434778 100644
--- a/sysdeps/arm/fpu/fesetenv.c
+++ b/sysdeps/arm/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   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
@@ -27,7 +27,7 @@ fesetenv (const fenv_t *envp)
       _FPU_SETCW(_FPU_DEFAULT);
   else
     {
-      unsigned long temp = envp->cw;
+      unsigned long temp = envp->__cw;
       _FPU_SETCW(temp);
     }
 }