git: 414924d92171 - main - skein: Update guard define check
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 24 Jul 2022 22:55:47 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=414924d921710d3528834ba708938b7f3fd32a29 commit 414924d921710d3528834ba708938b7f3fd32a29 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2022-07-24 21:52:20 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <sys/endian.h> #include <sys/types.h> -#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 */