From nobody Tue Apr 30 00:49:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VT1mD6Pw5z5Hjxr; Tue, 30 Apr 2024 00:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VT1mD4MRNz4KTB; Tue, 30 Apr 2024 00:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kO2y0jgDhu7dSBrDizevy4AtTNkfVflJ6wo+3CWyRO4=; b=jmt4gMjHbsYR3O0N3CMMDGSO2KDlDiA1LldC0x769LMCIn+tzI/U7rKZuthU03nk24k2uK RKj6xw+2pvMBWXIHDA9Z6IQjXQLhPBQsUfNb1q3YaoISh40yR1i1LSiIHriYkyo7bmVaor jD+s+9c9ZA28i8fEfBNxu/9xTdALNN0tMrBOadXa6zTABcXMvkSNNS4iV0bBNnRVeh4ueC yPI6UIlevW6jXnJoNjpTQPxlJt/TfrGh6uq/YmrA0Q9QlzYQffi3NW2r6wBHA74A6orQ8N odrcGVJBvDR6ceCt2Q3swTnKYGsJYcMETjJUfAeR67AuDzx4P+cDDR7+zBqV6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714438140; a=rsa-sha256; cv=none; b=hZMxd9BZKdAG5dGJp26qfF/LaClcm6xTYULtb0J+aWLcTnhudkNoCDE111wQ8sHhINPthA vwAexdCd89zcqxzsWW1aE5KrO6TQKZ5uqP6Y+CeJuiBHxvqf4ye6ucDE3GaM95jE7Z+VRh aLoS4qbCpgTFfiwWey/xzHnxkdgs4+CYNN6OofoZmAvZkzjpEqr1D/gWAvrLlJNpVHFfIa VKCOjf74fkfiNS19iC1Rd6KlqHrz3z+r4hQgl1vgf8wn4IInSoPkwahKrcbumc/oaBGvbA 9VeQe63w8mtc89FvUUBjUaM8V7bbNjE1nxXeakWVSwkQdvinMFhvF8VGSTEOKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kO2y0jgDhu7dSBrDizevy4AtTNkfVflJ6wo+3CWyRO4=; b=pbu7NCA7qgg+1wGXwaR8vVBA5qFqkd1hB5mtTZ6BKG3SeBp28u5NOUXB3TIC3AqQucwCnJ rIhrXhVoCDjshYFUF69mqCxyS8VsK8EpUXAuf8kUjXk+m1/3uz1ULHhK3HN1DMHQSP92Pr 2hwuMahlTbqlt4N+dc7UHCloLa8munVG/7V9zVzh3wthYR+PqnE45GUv+ZzLSUSBi7+hGE h8y4kXw19J3yz4RawRIhL5jelteMc0BwFzVKKxKwiAdDdy8O2j0WW9WkfD9IITQ/MpRCzu 480bWJJNJaEqKU5UFdBRhkke3Q8sthmZKEGiORpdOHbLYix7NiVwrTP1XjoBbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VT1mD3yDtz1SJ3; Tue, 30 Apr 2024 00:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43U0n0Do012879; Tue, 30 Apr 2024 00:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U0n0nm012876; Tue, 30 Apr 2024 00:49:00 GMT (envelope-from git) Date: Tue, 30 Apr 2024 00:49:00 GMT Message-Id: <202404300049.43U0n0nm012876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3fbb97541cfe - stable/14 - sys/signal.h: move union sigval into dedicated private header sys/_sigval.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3fbb97541cfe1833fb45ff69830948d08413f6c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3fbb97541cfe1833fb45ff69830948d08413f6c6 commit 3fbb97541cfe1833fb45ff69830948d08413f6c6 Author: Konstantin Belousov AuthorDate: 2024-04-19 14:57:51 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-30 00:48:09 +0000 sys/signal.h: move union sigval into dedicated private header sys/_sigval.h (cherry picked from commit 97acb35bd704ac1ef0bd2e286eb8bd09ce4b3ef0) --- 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 2165a9655a10..6a519db54893 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -42,6 +42,7 @@ #include #include #include +#include #include /* __MINSIGSTKSZ */ #include /* sig_atomic_t; trap codes; sigcontext */ @@ -166,27 +167,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;