diff options
| author | Andrii Nakryiko <[email protected]> | 2019-06-17 19:26:50 +0000 |
|---|---|---|
| committer | Daniel Borkmann <[email protected]> | 2019-06-17 22:08:54 +0000 |
| commit | d7fe74f9404a9736e9d4f754c30e43640a822c17 (patch) | |
| tree | 6d2addde09dcb0095db479aa801575f173e886b8 /tools/lib/bpf/bpf.c | |
| parent | bpf: Fix build error without CONFIG_INET (diff) | |
| download | kernel-d7fe74f9404a9736e9d4f754c30e43640a822c17.tar.gz kernel-d7fe74f9404a9736e9d4f754c30e43640a822c17.zip | |
libbpf: add common min/max macro to libbpf_internal.h
Multiple files in libbpf redefine their own definitions for min/max.
Let's define them in libbpf_internal.h and use those everywhere.
Signed-off-by: Andrii Nakryiko <[email protected]>
Acked-by: Song Liu <[email protected]>
Signed-off-by: Daniel Borkmann <[email protected]>
Diffstat (limited to 'tools/lib/bpf/bpf.c')
| -rw-r--r-- | tools/lib/bpf/bpf.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 0d4b4fe10a84..c7d7993c44bb 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -26,10 +26,11 @@ #include <memory.h> #include <unistd.h> #include <asm/unistd.h> +#include <errno.h> #include <linux/bpf.h> #include "bpf.h" #include "libbpf.h" -#include <errno.h> +#include "libbpf_internal.h" /* * When building perf, unistd.h is overridden. __NR_bpf is @@ -53,10 +54,6 @@ # endif #endif -#ifndef min -#define min(x, y) ((x) < (y) ? (x) : (y)) -#endif - static inline __u64 ptr_to_u64(const void *ptr) { return (__u64) (unsigned long) ptr; |