summaryrefslogtreecommitdiffstats
path: root/ndk
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2013-08-06 01:21:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-08-06 01:21:03 +0000
commitcb4fcab5c495d4350b0fc2b547089da605f5a1c2 (patch)
treef3cb596959835f4fb3e7a035d05ea002fd4a03fb /ndk
parent2070ac6d1c64fb630e5fab8cd72a3ddddc23902f (diff)
parent09073f3d88137701492f285065c9f5e6b55a9fad (diff)
downloadandroid_development-cb4fcab5c495d4350b0fc2b547089da605f5a1c2.tar.gz
android_development-cb4fcab5c495d4350b0fc2b547089da605f5a1c2.tar.bz2
android_development-cb4fcab5c495d4350b0fc2b547089da605f5a1c2.zip
Merge "Add minimal supports to build multilib x86 toolchain with OpenMP"
Diffstat (limited to 'ndk')
-rw-r--r--ndk/platforms/android-3/include/stdint.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/ndk/platforms/android-3/include/stdint.h b/ndk/platforms/android-3/include/stdint.h
index 44613d5cf..7ae2595b8 100644
--- 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