diff options
| author | David Turner <digit@android.com> | 2011-08-09 13:37:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-09 13:37:17 -0700 |
| commit | 5647257e6e6debbf888058b9e0b6bab389f5356b (patch) | |
| tree | c86738a97cbe60dfe3fdf235796c51ba4b2a368c /ndk | |
| parent | a583cd15f77eee35b3d29bfd9dc8a6a6e21330cf (diff) | |
| parent | 3374f8ad2cd4fcff7ab40bd80672b8b380242c84 (diff) | |
| download | android_development-5647257e6e6debbf888058b9e0b6bab389f5356b.tar.gz android_development-5647257e6e6debbf888058b9e0b6bab389f5356b.tar.bz2 android_development-5647257e6e6debbf888058b9e0b6bab389f5356b.zip | |
am 3374f8ad: am 254a7090: am 0f97bab8: Merge changes Ibee74a22,Ifef4dc98
* commit '3374f8ad2cd4fcff7ab40bd80672b8b380242c84':
NDK: x86 header file has incorrect definition for ptrdiff_t
Fix size_t definition in x86 NDK header file
Diffstat (limited to 'ndk')
| -rw-r--r-- | ndk/platforms/android-9/arch-x86/include/machine/_types.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ndk/platforms/android-9/arch-x86/include/machine/_types.h b/ndk/platforms/android-9/arch-x86/include/machine/_types.h index e9280a5da..65892a11e 100644 --- a/ndk/platforms/android-9/arch-x86/include/machine/_types.h +++ b/ndk/platforms/android-9/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; @@ -51,7 +51,11 @@ typedef long int ssize_t; #endif #ifndef _PTRDIFF_T #define _PTRDIFF_T -typedef long ptrdiff_t; +# ifdef __ANDROID__ + typedef int ptrdiff_t; +# else + typedef long ptrdiff_t; +# endif #endif #include <linux/types.h> |