alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-09 00:00:04 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bcachefs-tools: Guard the __struct_group() #define in kernel.h

Browse Source 
Our include/linux/byteorder.h uses the system <asm/byteorder.h>
because we don't provide our own in include/asm. This then pulls in
system <linux/stddef.h> which defines __struct_group. That definition
collides with the unconditional #define __struct_group in our local
include/linux/kernel.h, provoking preprocessor warnings.

Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Chris Webb 2023-12-09 14:15:08 +00:00 committed by Kent Overstreet
parent 872cd437e7
commit 0d401928b8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/kernel.h
View File

@ -99,11 +99,14 @@
(type *)((char *)__mptr - offsetof(type, member)); }) (type *)((char *)__mptr - offsetof(type, member)); })
#endif #endif
#ifndef __struct_group
#define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \ #define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \
union { \ union { \
struct { MEMBERS } ATTRS; \ struct { MEMBERS } ATTRS; \
struct TAG { MEMBERS } ATTRS NAME; \ struct TAG { MEMBERS } ATTRS NAME; \
} }
#endif
#define struct_group(NAME, MEMBERS...) \ #define struct_group(NAME, MEMBERS...) \
__struct_group(/* no tag */, NAME, /* no attrs */, MEMBERS) __struct_group(/* no tag */, NAME, /* no attrs */, MEMBERS)