[Glibc-bsd-commits] r5827 - trunk/glibc-ports/kfreebsd/bits

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-11-02 12:55:21 +0000 (Mon, 02 Nov 2015)
New Revision: 5827

Modified:
   trunk/glibc-ports/kfreebsd/bits/siginfo.h
Log:
Update bits/siginfo.h from latest kfreebsd


Modified: trunk/glibc-ports/kfreebsd/bits/siginfo.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/siginfo.h	2015-11-02 12:17:20 UTC (rev 5826)
+++ trunk/glibc-ports/kfreebsd/bits/siginfo.h	2015-11-02 12:55:21 UTC (rev 5827)
@@ -52,11 +52,50 @@
     int si_status;		/* Exit value or signal.  */
     void *si_addr;		/* Address of faulting instruction.  */
     union sigval si_value;	/* Signal value.  */
-    long int si_band;		/* Band event for SIGPOLL.  */
-    int __si_spare[7];
+    union
+      {
+	struct
+	  {
+	    int     _trapno;	/* machine specific trap code */
+	   } _fault;
+
+	/* POSIX.1b timers.  */
+	struct
+	  {
+	    int     _timerid;
+	    int     _overrun;
+	  } _timer;
+
+	struct
+	  {
+	    int     _mqd;
+	  } _mesgq;
+
+	/* SIGPOLL.  */
+	struct
+	  {
+	    long    _band;	/* band event for SIGPOLL.  */
+	  } _poll;
+
+	struct
+	  {
+	    long    __spare1__;
+	    int     __spare2__[7];
+	  } __spare__;
+	} _reason;
   } siginfo_t;
 
 
+/* X/Open requires some more fields with fixed names.  */
+# define si_int		si_value.sival_int
+# define si_ptr		si_value.sival_ptr
+# define si_trapno	_reason._fault._trapno
+# define si_timerid	_reason._timer._timerid
+# define si_overrun	_reason._timer._overrun
+# define si_mqd		_reason._mesgq._mqd
+# define si_band	_reason._poll._band
+
+
 /* Values for `si_code'.  Positive values are reserved for kernel-generated
    signals.  */
 enum