Commit 20f21d98 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov

libbpf: Revert bpf_helper_defs.h inclusion regression

Revert bpf_helpers.h's change to include auto-generated bpf_helper_defs.h
through <> instead of "", which causes it to be searched in include path. This
can break existing applications that don't have their include path pointing
directly to where libbpf installs its headers.

There is ongoing work to make all (not just bpf_helper_defs.h) includes more
consistent across libbpf and its consumers, but this unbreaks user code as is
right now without any regressions. Selftests still behave sub-optimally
(taking bpf_helper_defs.h from libbpf's source directory, if it's present
there), which will be fixed in subsequent patches.

Fixes: 6910d7d3 ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir")
Reported-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200117004103.148068-1-andriin@fb.com
parent 35697c12
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#ifndef __BPF_HELPERS__ #ifndef __BPF_HELPERS__
#define __BPF_HELPERS__ #define __BPF_HELPERS__
#include <bpf_helper_defs.h> #include "bpf_helper_defs.h"
#define __uint(name, val) int (*name)[val] #define __uint(name, val) int (*name)[val]
#define __type(name, val) typeof(val) *name #define __type(name, val) typeof(val) *name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment