Skip to content

Commit

Permalink
Remove offsetof() from user-visible <linux/stddef.h>
Browse files Browse the repository at this point in the history
It's not used by anything user-visible, and it make g++ unhappy.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
  • Loading branch information
David Woodhouse committed Sep 22, 2006
1 parent ed9526b commit 1694176
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion include/linux/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ header-y += snmp.h
header-y += sockios.h
header-y += som.h
header-y += sound.h
header-y += stddef.h
header-y += synclink.h
header-y += telephony.h
header-y += termios.h
Expand Down Expand Up @@ -318,6 +317,7 @@ unifdef-y += sonet.h
unifdef-y += sonypi.h
unifdef-y += soundcard.h
unifdef-y += stat.h
unifdef-y += stddef.h
unifdef-y += sysctl.h
unifdef-y += tcp.h
unifdef-y += time.h
Expand Down
2 changes: 2 additions & 0 deletions include/linux/stddef.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
#define NULL ((void *)0)
#endif

#ifdef __KERNEL__
#undef offsetof
#ifdef __compiler_offsetof
#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
#else
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#endif
#endif /* __KERNEL__ */

#endif

0 comments on commit 1694176

Please sign in to comment.