diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-21 16:13:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-21 16:13:24 -0800 |
| commit | 2293b51c64b75d3b6cdbdc4d0f5d790ef89ec55f (patch) | |
| tree | 1cbaa91144ab71a2cfd0873a35573224f07561b0 /ndk/platforms/android-3/include/stdio.h | |
| parent | 26d1e005e5b728f8ffac5165e1358c8379090c55 (diff) | |
| parent | 9a204c557fd0ba86e666b6d47c2b29b7894d76ba (diff) | |
am 9a204c55: Merge "Remove duplicated definitions of size_t and ssize_t"
* commit '9a204c557fd0ba86e666b6d47c2b29b7894d76ba':
Remove duplicated definitions of size_t and ssize_t
Diffstat (limited to 'ndk/platforms/android-3/include/stdio.h')
| -rw-r--r-- | ndk/platforms/android-3/include/stdio.h | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/ndk/platforms/android-3/include/stdio.h b/ndk/platforms/android-3/include/stdio.h index 273f63030..a56faa2f3 100644 --- a/ndk/platforms/android-3/include/stdio.h +++ b/ndk/platforms/android-3/include/stdio.h @@ -39,7 +39,7 @@ #define _STDIO_H_ #include <sys/cdefs.h> -#include <sys/_types.h> +#include <sys/types.h> /* va_list and size_t must be defined by stdio.h according to Posix */ #define __need___va_list @@ -49,30 +49,9 @@ #define __need_size_t #include <stddef.h> +#define __need_NULL #include <stddef.h> -#if __BSD_VISIBLE || __POSIX_VISIBLE || __XPG_VISIBLE -#include <sys/types.h> /* XXX should be removed */ -#endif - -#ifndef _SIZE_T_DEFINED_ -#define _SIZE_T_DEFINED_ -typedef unsigned long size_t; -#endif - -#ifndef _OFF_T_DEFINED_ -#define _OFF_T_DEFINED_ -typedef long off_t; -#endif - -#ifndef NULL -#ifdef __GNUG__ -#define NULL __null -#else -#define NULL 0L -#endif -#endif - #define _FSTDIO /* Define for new stdio with functions. */ typedef off_t fpos_t; /* stdio file position type */ |