Commit eff81908 authored by Andrey Ignatov's avatar Andrey Ignatov Committed by Daniel Borkmann
Browse files

libbpf: Make include guards consistent 



Rename include guards to have consistent names "__LIBBPF_<header_name>".

Signed-off-by: default avatarAndrey Ignatov <rdna@fb.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 24d6a808

tools/lib/bpf/bpf.h

+3 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
 * You should have received a copy of the GNU Lesser General Public

 * License along with this program; if not,  see <http://www.gnu.org/licenses>

 */

#ifndef __BPF_BPF_H

#define __BPF_BPF_H

#ifndef __LIBBPF_BPF_H

#define __LIBBPF_BPF_H



#include <linux/bpf.h>

#include <stdbool.h>
@@ -111,4 +111,4 @@ int bpf_load_btf(void *btf, __u32 btf_size, char *log_buf, __u32 log_buf_size, 
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);

#endif
 
#endif /* __LIBBPF_BPF_H */

tools/lib/bpf/btf.h

+3 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 */

/* Copyright (c) 2018 Facebook */



#ifndef __BPF_BTF_H

#define __BPF_BTF_H

#ifndef __LIBBPF_BTF_H

#define __LIBBPF_BTF_H



#include <linux/types.h>
@@ -23,4 +23,4 @@ int btf__resolve_type(const struct btf *btf, __u32 type_id); 
int btf__fd(const struct btf *btf);

const char *btf__name_by_offset(const struct btf *btf, __u32 offset);



#endif
 
#endif /* __LIBBPF_BTF_H */

tools/lib/bpf/libbpf.h

+3 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
 * You should have received a copy of the GNU Lesser General Public

 * License along with this program; if not,  see <http://www.gnu.org/licenses>

 */

#ifndef __BPF_LIBBPF_H

#define __BPF_LIBBPF_H

#ifndef __LIBBPF_LIBBPF_H

#define __LIBBPF_LIBBPF_H



#include <stdio.h>

#include <stdint.h>
@@ -315,4 +315,4 @@ 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);

#endif
 
#endif /* __LIBBPF_LIBBPF_H */

tools/lib/bpf/nlattr.h

+3 −3
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
 * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>

 */



#ifndef __NLATTR_H

#define __NLATTR_H

#ifndef __LIBBPF_NLATTR_H

#define __LIBBPF_NLATTR_H



#include <stdint.h>

#include <linux/netlink.h>
@@ -108,4 +108,4 @@ int libbpf_nla_parse_nested(struct nlattr *tb[], int maxtype, 


int libbpf_nla_dump_errormsg(struct nlmsghdr *nlh);



#endif /* __NLATTR_H */
 
#endif /* __LIBBPF_NLATTR_H */

tools/lib/bpf/str_error.h

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.1

#ifndef BPF_STR_ERROR

#define BPF_STR_ERROR

#ifndef __LIBBPF_STR_ERROR_H

#define __LIBBPF_STR_ERROR_H



char *libbpf_strerror_r(int err, char *dst, int len);

#endif // BPF_STR_ERROR
 
#endif /* __LIBBPF_STR_ERROR_H */