summaryrefslogtreecommitdiff
path: root/include/stdint.h
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-04-04 20:09:50 -0400
committerRich Felker <dalias@aerifal.cx>2013-04-04 20:09:50 -0400
commitf77bab5933071c46edc3da22b8c344533dd5fca3 (patch)
tree66e1ffb24d5ccc3d1845cac2306456894aa768aa /include/stdint.h
parentc7af2710007865861e789b29e803f0f55deba93f (diff)
downloadmusl-f77bab5933071c46edc3da22b8c344533dd5fca3.tar.gz
musl-f77bab5933071c46edc3da22b8c344533dd5fca3.tar.bz2
musl-f77bab5933071c46edc3da22b8c344533dd5fca3.tar.xz
musl-f77bab5933071c46edc3da22b8c344533dd5fca3.zip
fix type issues in stdint.h so underlying types of 64-bit types match ABI
Diffstat (limited to 'include/stdint.h')
-rw-r--r--include/stdint.h23
1 files changed, 15 insertions, 8 deletions
diff --git a/include/stdint.h b/include/stdint.h
index 486d1ac2..138fb211 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -24,6 +24,9 @@
#define __NEED_intptr_t
#define __NEED_uintptr_t
+#define __NEED_intmax_t
+#define __NEED_uintmax_t
+
#include <bits/alltypes.h>
typedef int8_t int_least8_t;
@@ -36,25 +39,22 @@ typedef uint16_t uint_least16_t;
typedef uint32_t uint_least32_t;
typedef uint64_t uint_least64_t;
-typedef long long intmax_t;
-typedef unsigned long long uintmax_t;
-
#if !defined __cplusplus || defined __STDC_LIMIT_MACROS
#define INT8_MIN (-1-0x7f)
#define INT16_MIN (-1-0x7fff)
#define INT32_MIN (-1-0x7fffffff)
-#define INT64_MIN (-1-0x7fffffffffffffffLL)
+#define INT64_MIN (-1-0x7fffffffffffffff)
#define INT8_MAX (0x7f)
#define INT16_MAX (0x7fff)
#define INT32_MAX (0x7fffffff)
-#define INT64_MAX (0x7fffffffffffffffLL)
+#define INT64_MAX (0x7fffffffffffffff)
#define UINT8_MAX (0xff)
#define UINT16_MAX (0xffff)
#define UINT32_MAX (0xffffffff)
-#define UINT64_MAX (0xffffffffffffffffULL)
+#define UINT64_MAX (0xffffffffffffffff)
#define INT_LEAST8_MIN INT8_MIN
#define INT_LEAST16_MIN INT16_MIN
@@ -95,15 +95,22 @@ typedef unsigned long long uintmax_t;
#define INT8_C(c) c
#define INT16_C(c) c
#define INT32_C(c) c
-#define INT64_C(c) c ## LL
#define UINT8_C(c) c
#define UINT16_C(c) c
#define UINT32_C(c) c ## U
-#define UINT64_C(c) c ## ULL
+#if UINTPTR_MAX == UINT64_MAX
+#define INT64_C(c) c ## L
+#define UINT64_C(c) c ## UL
+#define INTMAX_C(c) c ## L
+#define UINTMAX_C(c) c ## UL
+#else
+#define INT64_C(c) c ## LL
+#define UINT64_C(c) c ## ULL
#define INTMAX_C(c) c ## LL
#define UINTMAX_C(c) c ## ULL
+#endif
#endif