diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-03-29 11:01:59 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-03-29 11:01:59 -0700 |
| commit | 62ac0dc457bddf7472f7be1e9895b1aee20f35cf (patch) | |
| tree | a64eeb5831341d6f51c2f64af2335fc3a8a0e600 /libc | |
| parent | 7e0bfb511e85834d7c6cb9631206b62f82701d60 (diff) | |
| parent | 58f0326362ca0f5fc17cbc19fd9217cabf0d93dd (diff) | |
| download | bionic-62ac0dc457bddf7472f7be1e9895b1aee20f35cf.zip bionic-62ac0dc457bddf7472f7be1e9895b1aee20f35cf.tar.gz bionic-62ac0dc457bddf7472f7be1e9895b1aee20f35cf.tar.bz2 | |
merge from open-source master
Change-Id: I96d2cd063f084fd17116bf7ee08fa7109a3c1ceb
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/arch-x86/include/machine/_types.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/libc/arch-x86/include/machine/_types.h b/libc/arch-x86/include/machine/_types.h index 3a31e22..be4f6e4 100644 --- a/libc/arch-x86/include/machine/_types.h +++ b/libc/arch-x86/include/machine/_types.h @@ -36,10 +36,23 @@ #define _I386__TYPES_H_ /* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */ -#define _SIZE_T +#ifndef _SIZE_T +# define _SIZE_T +# ifdef ANDROID + typedef unsigned int size_t; +# else + typedef unsigned long size_t; +# endif +#endif +#if !defined(_SSIZE_T) && !defined(_SSIZE_T_DEFINED_) +#define _SSIZE_T +#define _SSIZE_T_DEFINED_ +typedef long int ssize_t; +#endif +#ifndef _PTRDIFF_T #define _PTRDIFF_T -typedef unsigned int size_t; -typedef int ptrdiff_t; +typedef long ptrdiff_t; +#endif #define _OFF_T_DEFINED_ #define _SIZE_T_DEFINED_ |