diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/efivar/files/patch-src_efivar.c | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/efivar/files/patch-src_efivar.c')
| -rw-r--r-- | devel/efivar/files/patch-src_efivar.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/devel/efivar/files/patch-src_efivar.c b/devel/efivar/files/patch-src_efivar.c new file mode 100644 index 000000000000..5a419a603b42 --- /dev/null +++ b/devel/efivar/files/patch-src_efivar.c @@ -0,0 +1,31 @@ +--- src/efivar.c.orig 2024-01-31 20:08:46 UTC ++++ src/efivar.c +@@ -20,6 +20,10 @@ + #include <string.h> + #include <limits.h> + ++#if defined(__FreeBSD__) ++# undef LIST_HEAD ++#endif ++ + extern char *optarg; + extern int optind, opterr, optopt; + +@@ -408,7 +412,7 @@ prepare_data(const char *filename, uint8_t **data, siz + goto err; + + buflen = statbuf.st_size; +- buf = mmap(NULL, buflen, PROT_READ, MAP_PRIVATE|MAP_POPULATE, fd, 0); ++ buf = mmap(NULL, buflen, PROT_READ, MAP_PRIVATE, fd, 0); + if (buf == MAP_FAILED) + goto err; + +@@ -447,7 +451,7 @@ usage(int ret) + "Help options:\n" + " -?, --help Show this help message\n" + " --usage Display brief usage message\n", +- program_invocation_short_name); ++ getprogname()); + exit(ret); + } + |