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
This commit is contained in:
David Turner 2011-08-09 13:37:30 -07:00 committed by Android Git Automerger
commit 6dcf0d73a6

View File

@ -51,7 +51,11 @@ typedef long int ssize_t;
#endif #endif
#ifndef _PTRDIFF_T #ifndef _PTRDIFF_T
#define _PTRDIFF_T #define _PTRDIFF_T
typedef long ptrdiff_t; # ifdef __ANDROID__
typedef int ptrdiff_t;
# else
typedef long ptrdiff_t;
# endif
#endif #endif
#include <linux/types.h> #include <linux/types.h>