Commit 8c7fbe57 authored Jun 25, 2015 by Joe Perches Committed by Linus Torvalds Jun 25, 2015

stddef.h: move offsetofend inside #ifndef/#endif guard, neaten



Commit 38764884 ("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>

parent 4d5b367c

include/linux/stddef.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@

		#include <uapi/linux/stddef.h>


		#undef NULL
		#define NULL ((void *)0)

		@@ -18,7 +17,6 @@ enum {
		#else
		#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER)
		#endif
		#endif

		/**
		* offsetofend(TYPE, MEMBER)
		@@ -28,3 +26,5 @@ enum {
		*/
		#define offsetofend(TYPE, MEMBER) \
		(offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER))

		#endif