diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-22 08:00:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-10-13 13:23:24 -0700 |
| commit | 1cb6e7a4dbdab1d0b61bf8d8ce37598224d7e3f6 (patch) | |
| tree | 2acaefc68e65ebeae77d478a3bceb27b0390c41a /include | |
| parent | 2f47815a5b9e60ad28589660f7bb86d2da28d199 (diff) | |
Remove offsetof() from user-visible <linux/stddef.h>
It's not used by anything user-visible, and it make g++ unhappy.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/Kbuild | 2 | ||||
| -rw-r--r-- | include/linux/stddef.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 7d076d97b2f..10d2ca07562 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -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 @@ -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 diff --git a/include/linux/stddef.h b/include/linux/stddef.h index b3a2cadf90f..ea65dfb60cd 100644 --- a/include/linux/stddef.h +++ b/include/linux/stddef.h @@ -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 |