*** /usr/include/sys/ucontext.h	Sat Dec 21 17:45:13 2002
--- ucontext.h	Thu Jan 16 13:54:45 2003
***************
*** 22,27 ****
--- 22,28 ----
  #include <features.h>
  #include <signal.h>
  #include <bits/wordsize.h>
+ #include <asm/reg.h>
  
  #if __WORDSIZE == 64
  
***************
*** 175,181 ****
   * dependent. The union FQu is guarenteed to be the first field in any ABI
   * conformant system implementation. Any additional fields provided by an
   * implementation should not be used applications designed to be ABI conformant. */
! 
  struct fpq
    {
      unsigned long *fpq_addr;		/* address */
--- 176,182 ----
   * dependent. The union FQu is guarenteed to be the first field in any ABI
   * conformant system implementation. Any additional fields provided by an
   * implementation should not be used applications designed to be ABI conformant. */
! #ifndef __SPARC_REG_H
  struct fpq
    {
      unsigned long *fpq_addr;		/* address */
***************
*** 190,195 ****
--- 191,197 ----
          struct fpq fpq;
        } FQu;
    };
+ #endif
  
  #define FPU_REGS_TYPE           unsigned
  #define FPU_DREGS_TYPE          unsigned long long
***************
*** 200,205 ****
--- 202,208 ----
  #if __WORDSIZE == 64
  
  typedef struct fpu
+ #ifndef __SPARC_REG_H
    {
      union {				/* FPU floating point regs */
        unsigned		fpu_regs[32];	/* 32 singles */
***************
*** 211,221 ****
      unsigned char   fpu_qcnt;		/* # of entries in saved FQ */
      unsigned char   fpu_q_entrysize;	/* # of bytes per FQ entry */
      unsigned char   fpu_en;		/* flag signifying fpu in use */
!   } fpregset_t;
  
  #else /* __WORDSIZE == 32 */
  
  typedef struct fpu
    {
      union {				/* FPU floating point regs */
        unsigned long long fpu_regs[32];	/* 32 singles */
--- 214,227 ----
      unsigned char   fpu_qcnt;		/* # of entries in saved FQ */
      unsigned char   fpu_q_entrysize;	/* # of bytes per FQ entry */
      unsigned char   fpu_en;		/* flag signifying fpu in use */
!   }
! #endif 
! fpregset_t;
  
  #else /* __WORDSIZE == 32 */
  
  typedef struct fpu
+ #ifndef __SPARC_REG_H
    {
      union {				/* FPU floating point regs */
        unsigned long long fpu_regs[32];	/* 32 singles */
***************
*** 226,232 ****
      unsigned char   fpu_qcnt;		/* # of entries in saved FQ */
      unsigned char   fpu_q_entrysize;	/* # of bytes per FQ entry */
      unsigned char   fpu_en;		/* flag signifying fpu in use */
!   } fpregset_t;
  
  /*
   * The following structure is for associating extra register state with
--- 232,240 ----
      unsigned char   fpu_qcnt;		/* # of entries in saved FQ */
      unsigned char   fpu_q_entrysize;	/* # of bytes per FQ entry */
      unsigned char   fpu_en;		/* flag signifying fpu in use */
!   } 
! #endif
! fpregset_t;
  
  /*
   * The following structure is for associating extra register state with