| Message ID | 157918094400.1357254.5646603555325507261.stgit@toke.dk (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tools: Use consistent libbpf include paths everywhere | expand |
On Thu, Jan 16, 2020 at 5:23 AM Toke Høiland-Jørgensen <toke@redhat.com> wrote: > > From: Toke Høiland-Jørgensen <toke@redhat.com> > > The change to use angled includes for bpf_helper_defs.h breaks compilation > against libbpf when it is installed in the include path, since the file is > installed in the bpf/ subdirectory of $INCLUDE_PATH. Since we've now fixed > the selftest Makefile to not require this anymore, revert back to > double-quoted include so bpf_helpers.h works regardless of include path. > > Fixes: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir") > Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> > --- Acked-by: Andrii Nakryiko <andriin@fb.com> > tools/lib/bpf/bpf_helpers.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/lib/bpf/bpf_helpers.h b/tools/lib/bpf/bpf_helpers.h > index 050bb7bf5be6..f69cc208778a 100644 > --- a/tools/lib/bpf/bpf_helpers.h > +++ b/tools/lib/bpf/bpf_helpers.h > @@ -2,7 +2,7 @@ > #ifndef __BPF_HELPERS__ > #define __BPF_HELPERS__ > > -#include <bpf_helper_defs.h> > +#include "bpf_helper_defs.h" > > #define __uint(name, val) int (*name)[val] > #define __type(name, val) typeof(val) *name >
diff --git a/tools/lib/bpf/bpf_helpers.h b/tools/lib/bpf/bpf_helpers.h index 050bb7bf5be6..f69cc208778a 100644 --- a/tools/lib/bpf/bpf_helpers.h +++ b/tools/lib/bpf/bpf_helpers.h @@ -2,7 +2,7 @@ #ifndef __BPF_HELPERS__ #define __BPF_HELPERS__ -#include <bpf_helper_defs.h> +#include "bpf_helper_defs.h" #define __uint(name, val) int (*name)[val] #define __type(name, val) typeof(val) *name