diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-29 18:59:15 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-29 18:59:16 -0800 |
| commit | 25f2d1f0c3c7802af0d4d1e2bbd3bf95a7e0970b (patch) | |
| tree | 4d5e35bd85c432de2d1be8383f9369ffcd31d028 /libc | |
| parent | afab5a703d30df613848cb30ab3ecceafd76102b (diff) | |
| parent | 53d161a2bc8a4c827225818709dae069416c9c85 (diff) | |
| download | bionic-25f2d1f0c3c7802af0d4d1e2bbd3bf95a7e0970b.zip bionic-25f2d1f0c3c7802af0d4d1e2bbd3bf95a7e0970b.tar.gz bionic-25f2d1f0c3c7802af0d4d1e2bbd3bf95a7e0970b.tar.bz2 | |
Merge "update stddef.h"
Diffstat (limited to 'libc')
| -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 |