diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2026-05-10 13:24:49 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2026-05-10 13:24:49 -0700 |
| commit | 7e033543a2ab4c72319201298ed458e3bbddd82f (patch) | |
| tree | d6c2f6517b65fdf17dd647ed9df1666f28b0ba35 /tools/include/uapi/linux | |
| parent | 2ca6723a5f7b68c739dba47b2639e3eaa7884b09 (diff) | |
| parent | afaa0a477099cb7256e26fe11289c753a225ac97 (diff) | |
| download | lwn-7e033543a2ab4c72319201298ed458e3bbddd82f.tar.gz lwn-7e033543a2ab4c72319201298ed458e3bbddd82f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.1-rc3
Cross-merge BPF and other fixes after downstream PR.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/include/uapi/linux')
| -rw-r--r-- | tools/include/uapi/linux/stddef.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/tools/include/uapi/linux/stddef.h b/tools/include/uapi/linux/stddef.h index c53cde425406..457498259494 100644 --- a/tools/include/uapi/linux/stddef.h +++ b/tools/include/uapi/linux/stddef.h @@ -3,7 +3,6 @@ #define _LINUX_STDDEF_H - #ifndef __always_inline #define __always_inline __inline__ #endif @@ -36,6 +35,11 @@ struct __struct_group_tag(TAG) { MEMBERS } ATTRS NAME; \ } ATTRS +#ifdef __cplusplus +/* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */ +#define __DECLARE_FLEX_ARRAY(T, member) \ + T member[0] +#else /** * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union * @@ -52,3 +56,23 @@ TYPE NAME[]; \ } #endif + +#ifndef __counted_by +#define __counted_by(m) +#endif + +#ifndef __counted_by_le +#define __counted_by_le(m) +#endif + +#ifndef __counted_by_be +#define __counted_by_be(m) +#endif + +#ifndef __counted_by_ptr +#define __counted_by_ptr(m) +#endif + +#define __kernel_nonstring + +#endif /* _LINUX_STDDEF_H */ |