commit e66ffef900f2193d6918d9b2c08ce5f815e153a1
author Elliott Hughes <enh@google.com> Mon Aug 05 15:51:54 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 05 15:51:54 2013 -0700
tree 217ced5bf943e683b5e9e2c9af2113885a9da7f9
parent 28e0ec8d619770265619250e502e17fb541e1044
parent cd927519a94939f2ebc307544f827baade529bc9

am cd927519: Merge "Fix stdint.h intptr_t/uintptr_t for x86_64/x32"

* commit 'cd927519a94939f2ebc307544f827baade529bc9':
  Fix stdint.h intptr_t/uintptr_t for x86_64/x32

libc/include/stdint.h

diff --git a/libc/include/stdint.h b/libc/include/stdint.h
index 8e2f99e..b6b6444 100644
--- a/libc/include/stdint.h
+++ b/libc/include/stdint.h
@@ -191,8 +191,13 @@
  * 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