From nobody Wed Sep 11 17:02:18 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 4X3n1Q1m2pz5TwD3; Wed, 11 Sep 2024 17:02:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3n1Q1FhNz4GQc; Wed, 11 Sep 2024 17:02:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726074138; 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=dEqnoxO/Jm+SOateiWMjiJTZJ3Gylwq++RZ424IvNkM=; b=q0qVN7H2oV6l7w5Ver+EODlJ191D4VixGDPKpw6m3wIQL53NElfF76RCKSZ9SYzSqoYILY jXZ7FF2FH05iiWCcJ8HnNv5qg0OwjFolKVzs2K+baGvZIF7/4GkmkO3ljxyd2KokCARyQc CBGPsZ2mdkGNqTvvz0kkuCqmwozk9MqDi1DiuOCShiNpNKLoqMTs5+b4LhTzmmFbbg3psM cVGnKtBs1KW8mjPgzxuI8xflVRwFtn6c868tr4Zphc9piCYV3IlsHL6v4U0kwBHWF6OVNf sRNgb4kLTxr6ktjqK9DRnr5FrEYjNbNPklhYYJ/kYNBUzuWNxzy2VSgcr4Ws1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726074138; a=rsa-sha256; cv=none; b=nfG0slLYPZxcjSUmFjuJpdqJlHi5KvIPUlr/9PYKy/VIXrdsQUPfgAkDUm06s3a0iqGOU6 fEl7kI/O/Ag/ntHV3xWi01wU7rjwxouFDKV1k30a+rKo3SrcY/7P3BWBaQVziu3vfUtm7r HEbT83sz2H4fx971oV9eONgiaj5/C/G8T9iX6wKGbLED42teIG80GLJ1MMCvdx1dEQsewv XSev42gwk1m6FQi8e0Ys65bONbNeOjdik251PnsJNLVqnHPSgpDi+/nvdQ/FxuXb3LCXZ6 A4ErfDgWAuIlVoEKxIqJAmUuaJduql72AvCzxnVtwfXnm0qedDoUQdsDGcouFw== 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=1726074138; 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=dEqnoxO/Jm+SOateiWMjiJTZJ3Gylwq++RZ424IvNkM=; b=vLtCWzMev1zYW1KxJwrQ89fhq0HmP+n/oNGKje0VtA0rIt7+8a/5lzib4rHYrCJveZ/ELE 0oenWXPc+Z+p7jDKrXnRecO9n1PO8lCzw6iArOsps3r5FvxB95KOraRWJo1OeC1zcvx6In WkGgPgvgJy9FH/5wF6Y+atJY62Aa3Dvm+Vdo23EgKeh5lP4/lmvlWFtD5Xo8FHWUMNfLC8 n/GS0eilovCxq4VaIViXtVaiiGyuZZ1EHkuk1HQbqOgSBdBnt01uQdMUoQC2ZgcxIbulT1 TUTL7ESisEFssF4awERONhCQXROiICB9afMWSvezcdD5MQPHVT7z+Z8LjMf9bw== 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 4X3n1Q0rnvzg9Z; Wed, 11 Sep 2024 17:02:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48BH2ITD059526; Wed, 11 Sep 2024 17:02:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48BH2IGO059523; Wed, 11 Sep 2024 17:02:18 GMT (envelope-from git) Date: Wed, 11 Sep 2024 17:02:18 GMT Message-Id: <202409111702.48BH2IGO059523@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 796c6031cde6 - main - Merge commit 88433e640ddb from upstream OpenZFS (by Jessica Clarke) 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 796c6031cde6dfdd92b4d178792fc0534bf788c5 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=796c6031cde6dfdd92b4d178792fc0534bf788c5 commit 796c6031cde6dfdd92b4d178792fc0534bf788c5 Author: Jessica Clarke AuthorDate: 2024-09-11 17:01:06 +0000 Commit: Jessica Clarke CommitDate: 2024-09-11 17:01:06 +0000 Merge commit 88433e640ddb from upstream OpenZFS (by Jessica Clarke) sys/types32.h: Remove struct timeval32 from libspl's header (#16491) macOS Sequoia's sys/sockio.h, as included by various bootstrap tools whilst building FreeBSD, has started to include net/if.h, which then includes sys/_types/_timeval32.h and provide a conflicting definition for struct timeval32. Since this type is entirely unused within OpenZFS, simply delete the type rather than adding in some kind of OS detection. This fixes building FreeBSD on macOS Sequoia (Beta). Signed-off-by: Jessica Clarke Reviewed-by: Rob Norris Reviewed-by: Alexander Motin Reviewed-by: Tony Hutter MFC after: 1 week --- sys/contrib/openzfs/lib/libspl/include/sys/types32.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h index eadc67c7122a..d065ebed03b7 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h @@ -65,11 +65,6 @@ typedef int32_t ssize32_t; typedef int32_t time32_t; typedef int32_t clock32_t; -struct timeval32 { - time32_t tv_sec; /* seconds */ - int32_t tv_usec; /* and microseconds */ -}; - typedef struct timespec32 { time32_t tv_sec; /* seconds */ int32_t tv_nsec; /* and nanoseconds */