| commit | c57fd963817afa8894af49d6c98a80d8f9100937 | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Fri Aug 05 09:23:29 2011 -0700 |
| committer | Android Code Review <code-review@android.com> | Fri Aug 05 09:23:29 2011 -0700 |
| tree | 2e901c624fcd83db159057107739d4d1c81aaffc | |
| parent | f5aa1382ec7592c58827ed0822c77cb5bf8df165 [diff] | |
| parent | c3c0e88beda2abee4380237bbc7aa95da588c00d [diff] |
Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"
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>