stddef.h: move offsetofend inside #ifndef/#endif guard, neaten
Commit 3876488444
("include/stddef.h: Move offsetofend() from vfio.h
to a generic kernel header") added offsetofend outside the normal
include #ifndef/#endif guard. Move it inside.
Miscellanea:
o remove unnecessary blank line
o standardize offsetof macros whitespace style
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4d5b367ca4
commit
8c7fbe5795
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <uapi/linux/stddef.h>
|
#include <uapi/linux/stddef.h>
|
||||||
|
|
||||||
|
|
||||||
#undef NULL
|
#undef NULL
|
||||||
#define NULL ((void *)0)
|
#define NULL ((void *)0)
|
||||||
|
|
||||||
|
@ -18,7 +17,6 @@ enum {
|
||||||
#else
|
#else
|
||||||
#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER)
|
#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* offsetofend(TYPE, MEMBER)
|
* offsetofend(TYPE, MEMBER)
|
||||||
|
@ -28,3 +26,5 @@ enum {
|
||||||
*/
|
*/
|
||||||
#define offsetofend(TYPE, MEMBER) \
|
#define offsetofend(TYPE, MEMBER) \
|
||||||
(offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER))
|
(offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER))
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue