From 0f2218fcd76c8f825657bc6f26203f2500d2b3d0 Mon Sep 17 00:00:00 2001 From: schwab Date: Sat, 22 May 1999 17:13:55 +0000 Subject: [PATCH] * sysdeps/m68k/fpu/bits/fenv.h (fenv_t): Prepend __ to member names to protect from user's macro namespace. * sysdeps/m68k/fpu/feholdexcpt.c, sysdeps/m68k/fpu/fesetenv.c: Adapted. --- sysdeps/m68k/fpu/feholdexcpt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sysdeps/m68k/fpu/feholdexcpt.c b/sysdeps/m68k/fpu/feholdexcpt.c index e36617d962..1ccf84bc86 100644 --- a/sysdeps/m68k/fpu/feholdexcpt.c +++ b/sysdeps/m68k/fpu/feholdexcpt.c @@ -1,5 +1,5 @@ /* Store current floating-point environment and clear exceptions. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Schwab @@ -29,10 +29,10 @@ feholdexcept (fenv_t *envp) __asm__ ("fmovem%.l %/fpcr/%/fpsr/%/fpiar,%0" : "=m" (*envp)); /* Now clear all exceptions. */ - fpsr = envp->status_register & ~FE_ALL_EXCEPT; + fpsr = envp->__status_register & ~FE_ALL_EXCEPT; __asm__ __volatile__ ("fmove%.l %0,%/fpsr" : : "dm" (fpsr)); /* And set all exceptions to non-stop. */ - fpcr = envp->control_register & ~(FE_ALL_EXCEPT << 6); + fpcr = envp->__control_register & ~(FE_ALL_EXCEPT << 6); __asm__ __volatile__ ("fmove%.l %0,%!" : : "dm" (fpcr)); return 1; -- 2.11.0