Define intptr_t and uintptr_t in terms of their equivalent exact-width types.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@89237 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/Headers/stdint.h b/lib/Headers/stdint.h
index 77f0e86e04..edc6e87503 100644
--- a/lib/Headers/stdint.h
+++ b/lib/Headers/stdint.h
@@ -213,16 +213,17 @@ typedef __uint_least8_t uint_fast8_t;
 
 /* C99 7.18.1.4 Integer types capable of holding object pointers.
  */
+#define __stdint_join3(a,b,c) a ## b ## c
+#define __stdint_exjoin3(a,b,c) __stdint_join3(a,b,c)
+
 #ifndef __intptr_t_defined
-typedef __INTPTR_TYPE__          intptr_t;
+typedef __stdint_exjoin3( int, __INTPTR_WIDTH__, _t) intptr_t;
 #define __intptr_t_defined
 #endif
-typedef unsigned __INTPTR_TYPE__ uintptr_t;
+typedef __stdint_exjoin3(uint, __INTPTR_WIDTH__, _t) uintptr_t;
 
 /* C99 7.18.1.5 Greatest-width integer types.
  */
-#define __stdint_join3(a,b,c) a ## b ## c
-#define __stdint_exjoin3(a,b,c) __stdint_join3(a,b,c)
 typedef __stdint_exjoin3( int, __INTMAX_WIDTH__, _t) intmax_t;
 typedef __stdint_exjoin3(uint, __INTMAX_WIDTH__, _t) uintmax_t;