diff options
author | David 'Digit' Turner <digit@android.com> | 2011-08-04 11:13:10 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-04 11:13:10 -0700 |
commit | a64990f3f25c45fcfe79b9b71cf54d7045af0e4f (patch) | |
tree | db7b2c66c406b190fb471284955b467630b06a49 /libc/arch-x86 | |
parent | bc9d1fe7c467d861a2b7c1deafca5589c1bc309e (diff) | |
parent | f03fb955a92bdcc341aaa1b4a6eb2d81bc844e06 (diff) | |
download | bionic-a64990f3f25c45fcfe79b9b71cf54d7045af0e4f.zip bionic-a64990f3f25c45fcfe79b9b71cf54d7045af0e4f.tar.gz bionic-a64990f3f25c45fcfe79b9b71cf54d7045af0e4f.tar.bz2 |
am f03fb955: am 023c4988: Merge "libc: x86: Fixed size_t definition."
* commit 'f03fb955a92bdcc341aaa1b4a6eb2d81bc844e06':
libc: x86: Fixed size_t definition.
Diffstat (limited to 'libc/arch-x86')
-rw-r--r-- | libc/arch-x86/include/machine/_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/arch-x86/include/machine/_types.h b/libc/arch-x86/include/machine/_types.h index e9280a5..5e28c64 100644 --- a/libc/arch-x86/include/machine/_types.h +++ b/libc/arch-x86/include/machine/_types.h @@ -38,7 +38,7 @@ /* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */ #ifndef _SIZE_T_DEFINED_ # define _SIZE_T_DEFINED_ -# ifdef ANDROID +# ifdef __ANDROID__ typedef unsigned int size_t; # else typedef unsigned long size_t; |