 +# define si_call_addr 	_sifields._sigsys._call_addr
 +# define si_syscall	_sifields._sigsys._syscall
 +# define si_arch	_sifields._sigsys._arch
++#endif
 +
  #endif /* defined(_POSIX_REALTIME_SIGNALS) || __POSIX_VISIBLE >= 199309 */
  

+  } _sifields;
+} siginfo_t __SI_ALIGNMENT;
+
+# define si_pid		_sifields._kill.si_pid
+# define si_uid		_sifields._kill.si_uid
+# define si_timerid	_sifields._timer.si_tid

 };
 
 /* Signal Actions, P1003.1b-1993, p. 64 */
@@ -69,10 +100,82 @@
   int          si_signo;    /* Signal number */
   int          si_code;     /* Cause of the signal */
   union sigval si_value;    /* Signal value */
