am c57fd963: Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"

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

am c57fd963: Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"
* commit 'c57fd963': NDK: x86 header file has incorrect definition for ptrdiff_t
17a40ffb · David Turner · Android Git Automerger · 3906a9c1 · c57fd963 · 17a40ffb
Commit 17a40ffb authored 13 years ago by David Turner Committed by Android Git Automerger 13 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

libc/arch-x86/include/machine/_types.h libc/arch-x86/include/machine/_types.h +5 -1

No files found.
--- 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>