tcpdump/backport-0010-Fix-a-not-defined-macro-error.patch

32 lines
1.1 KiB
Diff
Raw Permalink Normal View History

2024-05-07 10:58:22 +08:00
From bfc96b04831641376636337406aae7fe0fe65081 Mon Sep 17 00:00:00 2001
From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Wed, 6 Mar 2024 21:11:42 +0100
Subject: [PATCH] Capsicum support: Fix a 'not defined' macro error
The error was:
In file included from ./tcpdump.c:158:
./interface.h:62:32: error: "HAVE_CAPSICUM" is not defined, evaluates
to 0 [-Werror=undef]
62 | (defined(HAVE_BPF_DUMP) && HAVE_CAPSICUM && !defined(bpf_dump))
| ^~~~~~~~~~~~~
Conflict: NA
Reference: https://github.com/the-tcpdump-group/tcpdump/commit/bfc96b04831641376636337406aae7fe0fe65081
---
interface.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/interface.h b/interface.h
index b129312ab..0e35b7800 100644
--- a/interface.h
+++ b/interface.h
@@ -59,7 +59,7 @@ struct bpf_program;
* With Capsicum bpf_dump() may be not declared even if HAVE_BPF_DUMP is set.
*/
#if !defined(HAVE_BPF_DUMP) || \
- (defined(HAVE_BPF_DUMP) && HAVE_CAPSICUM && !defined(bpf_dump))
+ (defined(HAVE_BPF_DUMP) && defined(HAVE_CAPSICUM) && !defined(bpf_dump))
extern void bpf_dump(const struct bpf_program *, int);
#endif