git: 97acb35bd704 - main - sys/signal.h: move union sigval into dedicated private header sys/_sigval.h

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=97acb35bd704ac1ef0bd2e286eb8bd09ce4b3ef0

commit 97acb35bd704ac1ef0bd2e286eb8bd09ce4b3ef0
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-04-19 14:57:51 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-04-23 16:51:20 +0000

    sys/signal.h: move union sigval into dedicated private header sys/_sigval.h
    
    Reviewed by:    markj
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D44867
---
 sys/sys/_sigval.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sys/sys/signal.h  | 22 +-------------------
 2 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/sys/sys/_sigval.h b/sys/sys/_sigval.h
new file mode 100644
index 000000000000..b25a88b9bd71
--- /dev/null
+++ b/sys/sys/_sigval.h
@@ -0,0 +1,61 @@
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 1982, 1986, 1989, 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __SYS__SIGVAL_H
+#define	__SYS__SIGVAL_H
+
+#if __POSIX_VISIBLE >= 199309 || __XSI_VISIBLE >= 500
+union sigval {
+	/* Members as suggested by Annex C of POSIX 1003.1b. */
+	int	sival_int;
+	void	*sival_ptr;
+	/* 6.0 compatibility */
+	int     sigval_int;
+	void    *sigval_ptr;
+};
+
+#if defined(_WANT_LWPINFO32) || (defined(_KERNEL) && defined(__LP64__))
+union sigval32 {
+	int	sival_int;
+	__uint32_t sival_ptr;
+	/* 6.0 compatibility */
+	int	sigval_int;
+	__uint32_t sigval_ptr;
+};
+#endif
+#endif
+
+#endif	/* __SYS__SIGVAL_H */
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 690cab414e9e..113b5aaa9fa1 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -41,6 +41,7 @@
 #include <sys/_types.h>
 #include <sys/_sigset.h>
 #include <sys/_sigaltstack.h>
+#include <sys/_sigval.h>
 
 #include <machine/_limits.h>	/* __MINSIGSTKSZ */
 #include <machine/signal.h>	/* sig_atomic_t; trap codes; sigcontext */
@@ -165,27 +166,6 @@ typedef	__sigset_t	sigset_t;
 #endif
 #endif
 
-#if __POSIX_VISIBLE >= 199309 || __XSI_VISIBLE >= 500
-union sigval {
-	/* Members as suggested by Annex C of POSIX 1003.1b. */
-	int	sival_int;
-	void	*sival_ptr;
-	/* 6.0 compatibility */
-	int     sigval_int;
-	void    *sigval_ptr;
-};
-
-#if defined(_WANT_LWPINFO32) || (defined(_KERNEL) && defined(__LP64__))
-union sigval32 {
-	int	sival_int;
-	uint32_t sival_ptr;
-	/* 6.0 compatibility */
-	int	sigval_int;
-	uint32_t sigval_ptr;
-};
-#endif
-#endif
-
 #if __POSIX_VISIBLE >= 199309
 
 struct pthread_attr;