diff options
| author | David Turner <digit@android.com> | 2011-08-05 09:41:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-05 09:41:22 -0700 |
| commit | 17a40ffbf0e12ee44a024a9bb37434388478b478 (patch) | |
| tree | 5b94ba0d38892ea00ff7a71e9128378d80982181 | |
| parent | 3906a9c16b971c2689e1b8ae5455feec8cf7353c (diff) | |
| parent | c57fd963817afa8894af49d6c98a80d8f9100937 (diff) | |
| download | bionic-17a40ffbf0e12ee44a024a9bb37434388478b478.tar.gz | |
am c57fd963: Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"
* commit 'c57fd963817afa8894af49d6c98a80d8f9100937':
NDK: x86 header file has incorrect definition for ptrdiff_t
| -rw-r--r-- | libc/arch-x86/include/machine/_types.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libc/arch-x86/include/machine/_types.h b/libc/arch-x86/include/machine/_types.h index 5e28c6408..65892a11e 100644 --- a/libc/arch-x86/include/machine/_types.h +++ b/libc/arch-x86/include/machine/_types.h @@ -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> |