Commit 1cb6e7a4 authored by David Woodhouse's avatar David Woodhouse Committed by Greg Kroah-Hartman

Remove offsetof() from user-visible <linux/stddef.h>

It's not used by anything user-visible, and it make g++ unhappy.
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2f47815a
...@@ -143,7 +143,6 @@ header-y += snmp.h ...@@ -143,7 +143,6 @@ header-y += snmp.h
header-y += sockios.h header-y += sockios.h
header-y += som.h header-y += som.h
header-y += sound.h header-y += sound.h
header-y += stddef.h
header-y += synclink.h header-y += synclink.h
header-y += telephony.h header-y += telephony.h
header-y += termios.h header-y += termios.h
...@@ -318,6 +317,7 @@ unifdef-y += sonet.h ...@@ -318,6 +317,7 @@ unifdef-y += sonet.h
unifdef-y += sonypi.h unifdef-y += sonypi.h
unifdef-y += soundcard.h unifdef-y += soundcard.h
unifdef-y += stat.h unifdef-y += stat.h
unifdef-y += stddef.h
unifdef-y += sysctl.h unifdef-y += sysctl.h
unifdef-y += tcp.h unifdef-y += tcp.h
unifdef-y += time.h unifdef-y += time.h
......
...@@ -10,11 +10,13 @@ ...@@ -10,11 +10,13 @@
#define NULL ((void *)0) #define NULL ((void *)0)
#endif #endif
#ifdef __KERNEL__
#undef offsetof #undef offsetof
#ifdef __compiler_offsetof #ifdef __compiler_offsetof
#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER) #define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
#else #else
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#endif #endif
#endif /* __KERNEL__ */
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment