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
2011-08-05 09:41:22 -07:00
parent 3906a9c16b c57fd96381
commit 17a40ffbf0
1 changed files with 5 additions and 1 deletions
--- 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>