The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b38f48d33616337a8931c1c61f9e53981d4c0bcc
commit b38f48d33616337a8931c1c61f9e53981d4c0bcc Author: Jose Luis Duran <[email protected]> AuthorDate: 2025-11-13 16:08:44 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2025-11-25 18:17:23 +0000 libefivar: Standardize #ifndef __FreeBSD__ Standardize preprocessor directives that comment out unused functions (essentially #if 0). No functional change intended. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1894 --- lib/libefivar/efivar-dp-parse.c | 1 - lib/libefivar/uefi-dplib.h | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index c594e94580da..f2eb46a54509 100644 --- a/lib/libefivar/efivar-dp-parse.c +++ b/lib/libefivar/efivar-dp-parse.c @@ -313,7 +313,6 @@ GetNextDeviceNodeStr ( return ReturnStr; } - #ifndef __FreeBSD__ /** Return whether the integer string is a hex string. diff --git a/lib/libefivar/uefi-dplib.h b/lib/libefivar/uefi-dplib.h index 4787088dac19..c048a280a08e 100644 --- a/lib/libefivar/uefi-dplib.h +++ b/lib/libefivar/uefi-dplib.h @@ -175,8 +175,7 @@ typedef struct { #pragma pack() -#ifdef FreeBSD /* Remove these on FreeBSD */ - +#ifndef __FreeBSD__ /* Remove these on FreeBSD */ /** Returns the size of a device path in bytes.
