From nobody Tue Apr 23 16:52:36 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 4VP7TK1mHVz5Hcb2; Tue, 23 Apr 2024 16:52:37 +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 4VP7TK04qxz48tf; Tue, 23 Apr 2024 16:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713891157; 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=VGf31jmc61w56+NKk0e6gn+/AFHOTvDHE3kDdYARYtk=; b=BLeuiYTlRUmrVUmo2+JqH2fRAAcfOA/4s9a53+eYfU0KSyWJ9C0I90IBQxFkvTgwfup3xD ACMbkfUnhmWQW+ipuxdMjSS1mqBoBQI0lap77bQjmGkolrYQDmnG7Wak2KQh9CJ6xaPOrz m6ITZbOAB9d0Dv/DiZoDGPz81HVqELJ+siWq2Tt15styGvbLHoR+fswyq2OXLoyNYPk5qx NpWsgN6Fx1ToNENzhBr7vJKKyPc3NXqMlhSa+aHo6a/by4fgErgvT1xTOGn5EA6sb74wZU s3dYFdfdFJP39OG1Em43OgQQ7Kdd2MAkBY3RKbXUhKRBBy0ccGIra4TjciCiPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713891157; a=rsa-sha256; cv=none; b=II7MIH1a+0lCOfZmgiQPtlwiF5GpekkDyo9BbGQy8xcH+WNovZkMFKos4BbXN+TUMPI4Vx fX8usNjE8a0cMDBkKmWl7GhBF0hvJdkrk9Z1DoZuVHXemGc1xecrw/9oJKFTAv4sMGc2bz RYFg4+dXztTyJS45pk5GqwurzAts/V/7SYALMQGgGMfjoKyvGXJQY7yJT8zG3BiaztStAt AXK4x6o+NmxwwvtLBogk5jLitk+47YGpLjUxlAetIBUV3gMhce0EVDb6yvEdjbAw/0OSuS ArZTBMdcFaljsQbh7ysbnXydHzLFvcKBLjP3k6Pfsc2k5trdSoBS7PnxzN6XdQ== 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=1713891157; 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=VGf31jmc61w56+NKk0e6gn+/AFHOTvDHE3kDdYARYtk=; b=Y05sFespw2tlpeeEPthwHjG7OTC5jRZ085BvwlAlvIYO91BMMoD6pt8wAf/BJ8hYdvy5dm uFij9XHtGyJXNWdDMbqAnE+0lJNYdkphhWrvgS5r86n2aPdsqNXTT/ON6rnCHU5b7I1kmY FAhHwt+gPXkRD/Y8wcR3j8ulM7R/CCemCpzZWTo07d+Feh6MHnB5oLakkEBRpPomAIsF6d 9aScQKr69R/lWydQGqLwBwqn7laHpf+Qj3zXSFutWHquxmUQJl4ZUACIGVXaHaSkDKtv+q xZb6hq7vUw+8xlFgm0mDORzJQk43Ue0c7/Q6wLDZRG/9B87gznLMW1GKkiC2Pg== 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 4VP7TJ6njxzfxs; Tue, 23 Apr 2024 16:52:36 +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 43NGqacJ088210; Tue, 23 Apr 2024 16:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NGqaFZ088207; Tue, 23 Apr 2024 16:52:36 GMT (envelope-from git) Date: Tue, 23 Apr 2024 16:52:36 GMT Message-Id: <202404231652.43NGqaFZ088207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 97acb35bd704 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 97acb35bd704ac1ef0bd2e286eb8bd09ce4b3ef0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=97acb35bd704ac1ef0bd2e286eb8bd09ce4b3ef0 commit 97acb35bd704ac1ef0bd2e286eb8bd09ce4b3ef0 Author: Konstantin Belousov AuthorDate: 2024-04-19 14:57:51 +0000 Commit: Konstantin Belousov 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 #include #include +#include #include /* __MINSIGSTKSZ */ #include /* 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;