From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stanislav Fomichev Subject: [PATCH bpf-next] libbpf: make sure bpf headers are c++ include-able Date: Tue, 20 Nov 2018 10:14:40 -0800 Message-ID: <20181120181440.10346-1-sdf@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Cc: Stanislav Fomichev To: netdev@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net Return-path: Received: from mail-it1-f202.google.com ([209.85.166.202]:56176 "EHLO mail-it1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726047AbeKUEpK (ORCPT ); Tue, 20 Nov 2018 23:45:10 -0500 Received: by mail-it1-f202.google.com with SMTP id 71-v6so3704564itl.5 for ; Tue, 20 Nov 2018 10:14:43 -0800 (PST) Sender: netdev-owner@vger.kernel.org List-ID: Wrap headers in extern "C", to turn off C++ mangling. This simplifies including libbpf in c++ and linking against it. Signed-off-by: Stanislav Fomichev --- tools/lib/bpf/bpf.h | 9 +++++++++ tools/lib/bpf/libbpf.h | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index 26a51538213c..9ea3aec82d8a 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -27,6 +27,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + #ifndef LIBBPF_API #define LIBBPF_API __attribute__((visibility("default"))) #endif @@ -128,4 +132,9 @@ LIBBPF_API int bpf_load_btf(void *btf, __u32 btf_size, char *log_buf, LIBBPF_API int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf, __u32 *buf_len, __u32 *prog_id, __u32 *fd_type, __u64 *probe_offset, __u64 *probe_addr); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* __LIBBPF_BPF_H */ diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index b1686a787102..74e57e041705 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -16,6 +16,10 @@ #include // for size_t #include +#ifdef __cplusplus +extern "C" { +#endif + #ifndef LIBBPF_API #define LIBBPF_API __attribute__((visibility("default"))) #endif @@ -335,4 +339,9 @@ int libbpf_nl_get_qdisc(int sock, unsigned int nl_pid, int ifindex, libbpf_dump_nlmsg_t dump_qdisc_nlmsg, void *cookie); int libbpf_nl_get_filter(int sock, unsigned int nl_pid, int ifindex, int handle, libbpf_dump_nlmsg_t dump_filter_nlmsg, void *cookie); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* __LIBBPF_LIBBPF_H */ -- 2.19.1.1215.g8438c0b245-goog