diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-05 22:04:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-05 22:04:39 +0000 |
| commit | 375aaa3f608d6089102b256f162e423638a16c47 (patch) | |
| tree | 69b97d715c09e405c76354e314de27b69723164e /libc/include | |
| parent | 12e8b76e5f799b2b8407bf354a9675577529d34b (diff) | |
| parent | 9afe2884c7fe11f862982fd550a2ead688f2044d (diff) | |
| download | bionic-375aaa3f608d6089102b256f162e423638a16c47.zip bionic-375aaa3f608d6089102b256f162e423638a16c47.tar.gz bionic-375aaa3f608d6089102b256f162e423638a16c47.tar.bz2 | |
Merge "Kill <machine/_types.h>."
Diffstat (limited to 'libc/include')
| -rw-r--r-- | libc/include/err.h | 9 | ||||
| -rw-r--r-- | libc/include/sys/_types.h | 43 | ||||
| -rw-r--r-- | libc/include/sys/endian.h | 1 |
3 files changed, 42 insertions, 11 deletions
diff --git a/libc/include/err.h b/libc/include/err.h index f24da61..aad1f59 100644 --- a/libc/include/err.h +++ b/libc/include/err.h @@ -35,15 +35,8 @@ #ifndef _ERR_H_ #define _ERR_H_ -/* - * Don't use va_list in the err/warn prototypes. Va_list is typedef'd in two - * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one - * of them here we may collide with the utility's includes. It's unreasonable - * for utilities to have to include one of them to include err.h, so we get - * __va_list from <machine/_types.h> and use it. - */ #include <sys/cdefs.h> -#include <machine/_types.h> +#include <sys/types.h> __BEGIN_DECLS diff --git a/libc/include/sys/_types.h b/libc/include/sys/_types.h index 9d313d1..6bf9c1c 100644 --- a/libc/include/sys/_types.h +++ b/libc/include/sys/_types.h @@ -32,9 +32,48 @@ */ #ifndef _SYS__TYPES_H_ -#define _SYS__TYPES_H_ +#define _SYS__TYPES_H_ -#include <machine/_types.h> +typedef __signed char __int8_t; +typedef unsigned char __uint8_t; +typedef short __int16_t; +typedef unsigned short __uint16_t; +typedef int __int32_t; +typedef unsigned int __uint32_t; +#if __LP64__ +typedef long __int64_t; +typedef unsigned long __uint64_t; +#else +typedef long long __int64_t; +typedef unsigned long long __uint64_t; +#endif + +#if __LP64__ +typedef long __intptr_t; +typedef unsigned long __uintptr_t; +#else +typedef int __intptr_t; +typedef unsigned int __uintptr_t; +#endif + +#if __LP64__ +typedef long __time_t; +#else +typedef int __time_t; /* Historical accident. */ +#endif + +typedef int __timer_t; + +typedef int __clockid_t; + +#ifndef __cplusplus +typedef int __wchar_t; +#endif + +typedef double __double_t; +typedef float __float_t; + +typedef __builtin_va_list __va_list; typedef unsigned long __cpuid_t; /* CPU id */ typedef __uint32_t __fixpt_t; /* fixed point number */ diff --git a/libc/include/sys/endian.h b/libc/include/sys/endian.h index b0365d8..cbde121 100644 --- a/libc/include/sys/endian.h +++ b/libc/include/sys/endian.h @@ -38,7 +38,6 @@ #include <sys/cdefs.h> #include <machine/endian.h> -#include <machine/_types.h> #define _LITTLE_ENDIAN 1234 #define _BIG_ENDIAN 4321 |