commit 6dcf0d73a69e01a9ef1d4d2f1e61cd114c0851a5
author David Turner <digit@android.com> Tue Aug 09 13:37:30 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 09 13:37:30 2011 -0700
tree f5e68fa326dc7bdefef16cab0b999e38a88a0ee7
parent 3afafd46f3e0c820e3d0a1b13cceddbeea1b5966
parent 3dc94305e4eb243747248b43954c499ddc96638d

am 3dc94305: am 17a40ffb: am c57fd963: Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"

* commit '3dc94305e4eb243747248b43954c499ddc96638d':
  NDK: x86 header file has incorrect definition for ptrdiff_t

libc/arch-x86/include/machine/_types.h

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 @@
 #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>