diff options
| author | Nick Kralevich <nnk@google.com> | 2012-02-28 14:39:12 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-28 14:39:12 -0800 |
| commit | d638a500e96bdfec2bd3e34fc5545561b60cd9e6 (patch) | |
| tree | de5ae8a1d1778dc3badc1b73a385f94342bf82fa /libc/kernel/common/linux/stddef.h | |
| parent | a1d3e0d8eb0e1e76f6200d6d1dce602512a3f6a7 (diff) | |
| parent | ec37237d69289e2bb9836bfa0d071ab958234d00 (diff) | |
| download | bionic-d638a500e96bdfec2bd3e34fc5545561b60cd9e6.zip bionic-d638a500e96bdfec2bd3e34fc5545561b60cd9e6.tar.gz bionic-d638a500e96bdfec2bd3e34fc5545561b60cd9e6.tar.bz2 | |
Merge "update stddef.h"
Diffstat (limited to 'libc/kernel/common/linux/stddef.h')
| -rw-r--r-- | libc/kernel/common/linux/stddef.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libc/kernel/common/linux/stddef.h b/libc/kernel/common/linux/stddef.h index 5412f47..cca408c 100644 --- a/libc/kernel/common/linux/stddef.h +++ b/libc/kernel/common/linux/stddef.h @@ -7,25 +7,24 @@ *** structures, and macros generated from the original header, and thus, *** contains no copyrightable information. *** + *** To edit the content of this header, modify the corresponding + *** source file (e.g. under external/kernel-headers/original/) then + *** run bionic/libc/kernel/tools/update_all.py + *** + *** Any manual change here will be lost the next time this script will + *** be run. You've been warned! + *** **************************************************************************** ****************************************************************************/ #ifndef _LINUX_STDDEF_H #define _LINUX_STDDEF_H - #include <linux/compiler.h> - #undef NULL +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #ifdef __cplusplus #define NULL 0 #else #define NULL ((void *)0) +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif - -#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 |