From: Antonio Huete Jimenez <tuxillo@quantumachine.net>
Date: Mon, 21 Dec 2009 22:27:20 +0000 (+0100)
Subject: signal.h - Rename 'union sigval' members to fit requirements in SuSv2 and POSIX.
X-Git-Tag: v2.7.1~240
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/36934016eeaca3abd418acb1c68bd391d3b54aa7

signal.h - Rename 'union sigval' members to fit requirements in SuSv2 and POSIX.

Also leave the old members there to keep compatibility.

Taken-from: FreeBSD
---

diff --git a/share/examples/scsi_target/scsi_target.c b/share/examples/scsi_target/scsi_target.c
index 44a1545624..d59ceda151 100644
--- a/share/examples/scsi_target/scsi_target.c
+++ b/share/examples/scsi_target/scsi_target.c
@@ -831,7 +831,7 @@ get_ctio()
 	se = &c_descr->aiocb.aio_sigevent;
 	se->sigev_notify = SIGEV_KEVENT;
 	se->sigev_notify_kqueue = kq_fd;
-	se->sigev_value.sigval_ptr = ctio;
+	se->sigev_value.sival_ptr = ctio;
 
 	return (ctio);
 }
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 2e9dcc281d..55ebe9d3a2 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -1183,7 +1183,7 @@ _aio_aqueue(struct aiocb *job, struct aio_liojob *lj, int type)
 
 	if (aiocbe->uaiocb.aio_sigevent.sigev_notify == SIGEV_KEVENT) {
 		kev.ident = aiocbe->uaiocb.aio_sigevent.sigev_notify_kqueue;
-		kev.udata = aiocbe->uaiocb.aio_sigevent.sigev_value.sigval_ptr;
+		kev.udata = aiocbe->uaiocb.aio_sigevent.sigev_value.sival_ptr;
 	}
 	else {
 		/*
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 98ea2cbc44..1d07bb0665 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -204,9 +204,13 @@ typedef void __sighandler_t (int);
 
 #if defined(_P1003_1B_VISIBLE) || defined(_KERNEL)
 union sigval {
-	/* Members as suggested by Annex C of POSIX 1003.1b. */
-	int	sigval_int;
-	void	*sigval_ptr;
+	/* Members as suggested by SuSv2 and IEEE Std 1003.1 */
+	int     sival_int;
+	void	*sival_ptr;
+	/* Leave old members for backward compatibility */
+	int     sigval_int;
+	void    *sigval_ptr;
+
 };
 
 struct sigevent {