lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
It's not used by anything user-visible, and it make g++ unhappy.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse
2006-09-22 08:00:42 +01:00
parent ed9526b0d3
commit 1694176a21
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/Kbuild
View File

@@ -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
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

2
include/linux/stddef.h
View File

@@ -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