From nobody Sun Jul 24 22:55:47 2022 X-Original-To: dev-commits-src-main@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 4LrdnH4LlMz3yvNt; Sun, 24 Jul 2022 22:55:47 +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 4LrdnH3vhNz41sZ; Sun, 24 Jul 2022 22:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658703347; 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=nHLqSr1hS3BoFHwytzXZwybbRZxfhf6InH1lL9W9BhM=; b=t5uhUQVMQx3mdPgPzUjIeD/siPYEnyeAO+xfIAn3DaGV5BV5AESXpSe7aUM7sjwxQZHoA+ /pY9KqeKWKnKswaCjv5wpy6f9xX5F3PLetHKpRmjXOUpJNBqlqDXJp8+KKOc1WU86NlIAJ opRFLaJTAsAEloGbaO+H1v4CCf3V6q2m9TocVyHKO62PA4XGQ/DBdLz2+98iWPwcY5vmig S53wDxnjwkIZOCTRpMQOpdk3IwylF39f0TFT5eN/ktYH0m6vRnr+Iw6DDYGg8D9zTqnEl6 spJrX/mZYwHGpocfZYyDAN/2IDjAktg+SROBRkaHWbQCl0oE7u93ugqULvyAKQ== 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 4LrdnH2km9zb9Q; Sun, 24 Jul 2022 22:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26OMtluk004674; Sun, 24 Jul 2022 22:55:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OMtlo6004673; Sun, 24 Jul 2022 22:55:47 GMT (envelope-from git) Date: Sun, 24 Jul 2022 22:55:47 GMT Message-Id: <202207242255.26OMtlo6004673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 414924d92171 - main - skein: Update guard define check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 414924d921710d3528834ba708938b7f3fd32a29 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658703347; 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=nHLqSr1hS3BoFHwytzXZwybbRZxfhf6InH1lL9W9BhM=; b=pKXVdRgqBoYmUvxGo/L0or9JVCR5h+BMcMmDgZHSLtOqqBbf5H24o2HU+fQnGPbfLFn8ns Lids/l/oZBjC1XGrz0WFL8ITuoqui57IsEudV9QJbwraIYFJlj1kBQOmOLkBvz7F63CyDA x1qNzOnqJIntE1dEeOO/S0wX/0KmoEqgRcocpQKB2pdj+LFq77ljCzxRz1DdaucO7O3j16 fCuRDjwxC+Ap4NizZxt+MZJbc1lJM1Jti8vH1TCyPVawPCBFEFBhsO8vvmlAk+J9bdJwsC iIv2jUxVfLCbsqANaOWW6Mx24bmT0E/zT+++KwbGVlPDsJnci756V+si2AI6Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658703347; a=rsa-sha256; cv=none; b=HmzQ0EYQJhZgjWQjrZiGVxVUA8pdEcyiX1uAnce+EGO6DEiPYzZN5VN037nB/eu5ilvqaE uM5UtG5w3gmEGy/POawxLS4AYc4DiMKLiAGl3O2tq9/9IMLTxtYpncYE0XRbhdssapZoHT 6T+ztDrIFcxOVZOvlGUO3dUdKj2bUXrZXIEtKK68GYpevEXbDaXPvlHhCidwN0ByW5kMKk ZXY44ymLysD9ZrADq74RiaNe7UzbofaMym3AsGe5aA5HxEX9O4nPtITiRL0NfZPxL+sP+N EudyDMOTi6xZaZVc8GlYIkeMrwaJH5G0B9FzGWg2Idq5O4rosf2LYi6IVg3KMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=414924d921710d3528834ba708938b7f3fd32a29 commit 414924d921710d3528834ba708938b7f3fd32a29 Author: Warner Losh AuthorDate: 2022-07-24 21:52:20 +0000 Commit: Warner Losh CommitDate: 2022-07-24 22:53:35 +0000 skein: Update guard define check OpenZFS changed the define _OPENSOLARIS_SYS_TYPES_H_ to _SPL_SYS_TYPES_H_ to guard the sys/types.h compatibility file inclusion. Follow the change here. The only place in the tree _OPENSOLARIS_SYS_TYPES_H_ is mentioned is in the /* _OPENSOLARIS_SYS_TYPES_H_ */ at the end of sys/types.h. That needs to be changed upstream in OpenZFS since we don't like changing things in FreeBSD's tree. Sponsored by: Netflix Reviewed by: tsoome, delphij Differential Revision: https://reviews.freebsd.org/D35891 --- sys/crypto/skein/skein_port.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/crypto/skein/skein_port.h b/sys/crypto/skein/skein_port.h index a284ad9f2b39..6f36c35a3753 100644 --- a/sys/crypto/skein/skein_port.h +++ b/sys/crypto/skein/skein_port.h @@ -19,7 +19,7 @@ #include #include -#ifndef _OPENSOLARIS_SYS_TYPES_H_ /* Avoid redefining this typedef */ +#ifndef _SPL_SYS_TYPES_H_ /* Avoid redefining this typedef */ typedef unsigned int uint_t; /* native unsigned integer */ #endif typedef uint8_t u08b_t; /* 8-bit unsigned integer */