diff options
| author | David Turner <digit@android.com> | 2011-08-09 13:39:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-09 13:39:42 -0700 |
| commit | 68990d19e46cde44aa2996c0693d7861490434ed (patch) | |
| tree | f5e68fa326dc7bdefef16cab0b999e38a88a0ee7 | |
| parent | 9ac3e4377f05512c1d9972e514eaca99f98702c1 (diff) | |
| parent | 6dcf0d73a69e01a9ef1d4d2f1e61cd114c0851a5 (diff) | |
| download | bionic-68990d19e46cde44aa2996c0693d7861490434ed.zip bionic-68990d19e46cde44aa2996c0693d7861490434ed.tar.gz bionic-68990d19e46cde44aa2996c0693d7861490434ed.tar.bz2 | |
am 6dcf0d73: am 3dc94305: am 17a40ffb: am c57fd963: Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"
* commit '6dcf0d73a69e01a9ef1d4d2f1e61cd114c0851a5':
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 5e28c64..65892a1 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> |