Construct INTPTR_MIN, INTPTR_MAX, and UINTPTR_MAX from the exact-width limit

macros corresponding to __INTPTR_WIDTH__.

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

diff --git a/lib/Headers/stdint.h b/lib/Headers/stdint.h
index edc6e87503e17adfda9863f822519316d14e8f52..ccaf3499a425d5f62321e706eca53dd19798421f 100644 (file)
--- a/lib/Headers/stdint.h
+++ b/lib/Headers/stdint.h
@@ -603,29 +603,24 @@ typedef __stdint_exjoin3(uint, __INTMAX_WIDTH__, _t) uintmax_t;
 /* C99 7.18.2.4 Limits of integer types capable of holding object pointers. */
 /* C99 7.18.3 Limits of other integer types. */
 
+#define  INTPTR_MIN __stdint_exjoin3( INT, __INTPTR_WIDTH__, _MIN)
+#define  INTPTR_MAX __stdint_exjoin3( INT, __INTPTR_WIDTH__, _MAX)
+#define UINTPTR_MAX __stdint_exjoin3(UINT, __INTPTR_WIDTH__, _MAX)
+
 #if __POINTER_WIDTH__ == 64
 
-#define  INTPTR_MIN  INT64_MIN
-#define  INTPTR_MAX  INT64_MAX
-#define UINTPTR_MAX UINT64_MAX
 #define PTRDIFF_MIN  INT64_MIN
 #define PTRDIFF_MAX  INT64_MAX
 #define SIZE_MAX    UINT64_MAX
 
 #elif __POINTER_WIDTH__ == 32
 
-#define  INTPTR_MIN  INT32_MIN
-#define  INTPTR_MAX  INT32_MAX
-#define UINTPTR_MAX UINT32_MAX
 #define PTRDIFF_MIN  INT32_MIN
 #define PTRDIFF_MAX  INT32_MAX
 #define SIZE_MAX    UINT32_MAX
 
 #elif __POINTER_WIDTH__ == 16
 
-#define  INTPTR_MIN  INT16_MIN
-#define  INTPTR_MAX  INT16_MAX
-#define UINTPTR_MAX UINT16_MAX
 #define PTRDIFF_MIN  INT16_MIN
 #define PTRDIFF_MAX  INT16_MAX
 #define SIZE_MAX    UINT16_MAX