am cb4fcab5: Merge "Add minimal supports to build multilib x86 toolchain with OpenMP"

* commit 'cb4fcab5c495d4350b0fc2b547089da605f5a1c2': Add minimal supports to build multilib x86 toolchain with OpenMP
2013-08-05 18:26:13 -07:00
parent 81e2faf356 cb4fcab5c4
commit 5626ae5ef2
1 changed files with 5 additions and 0 deletions
--- a/ndk/platforms/android-3/include/stdint.h
+++ b/ndk/platforms/android-3/include/stdint.h
@@ -191,8 +191,13 @@ typedef uint64_t      uint_fast64_t;
 * intptr_t & uintptr_t
 */

+#ifdef __LP64__
+typedef long          intptr_t;
+typedef unsigned long uintptr_t;
+#else
 typedef int           intptr_t;
 typedef unsigned int  uintptr_t;
+#endif

 #ifdef __STDINT_LIMITS
 #  define INTPTR_MIN    INT32_MIN