From dfbe1207c1bbd105d1daa9b08cec0e9803b5464e Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Sat, 25 Mar 2023 17:59:11 +1100 Subject: [PATCH] aya-obj: fix compilation with nightly --- aya-obj/src/generated/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aya-obj/src/generated/mod.rs b/aya-obj/src/generated/mod.rs index 0a64f088..943c2703 100644 --- a/aya-obj/src/generated/mod.rs +++ b/aya-obj/src/generated/mod.rs @@ -18,7 +18,9 @@ mod linux_bindings_riscv64; #[cfg(target_arch = "x86_64")] mod linux_bindings_x86_64; -pub use btf_internal_bindings::*; +// don't re-export __u8 __u16 etc which are already exported by the +// linux_bindings_* module +pub use btf_internal_bindings::{bpf_core_relo, bpf_core_relo_kind, btf_ext_header}; #[cfg(target_arch = "x86_64")] pub use linux_bindings_x86_64::*;