commit 68a6009cc57f29ce227766ff7e81924300ee585b
parent 36027b922f764414cfe2871fb96f3626822ceef3
Author: Quentin Rameau <quinq@fifth.space>
Date: Sun, 19 Mar 2017 17:17:39 +0100
[libc] Fix stdint.h
Diffstat:
4 files changed, 204 insertions(+), 205 deletions(-)
diff --git a/libc/include/bits/amd64-sysv/arch/stdint.h b/libc/include/bits/amd64-sysv/arch/stdint.h
@@ -1,71 +1,71 @@
/* See LICENSE file for copyright and license details. */
-#define INT8_MIN (-128)
-#define INT8_MAX 127
-#define UINT8_MAX 255
+#define INT8_MAX 0x7F
+#define INT8_MIN (-INT8_MAX-1)
+#define UINT8_MAX 0xFF
-#define INT16_MIN (-32768)
-#define INT16_MAX 32767
-#define UINT16_MAX 65535
+#define INT16_MAX 0x7FFF
+#define INT16_MIN (-INT16_MAX-1)
+#define UINT16_MAX 0xFFFF
-#define INT32_MIN (-2147483648)
-#define INT32_MAX 2147483647
-#define UINT32_MAX 4294967295U
+#define INT32_MAX 0x7FFFFFFF
+#define INT32_MIN (-INT32_MAX-1)
+#define UINT32_MAX 0xFFFFFFFF
-#define INT64_MIN (-9223372036854775808)
-#define INT64_MAX 9223372036854775807
-#define UINT64_MAX 18446744073709551615U
+#define INT64_MAX 0x7FFFFFFFFFFFFFFF
+#define INT64_MIN (-INT64_MAX-1)
+#define UINT64_MAX 0xFFFFFFFFFFFFFFFF
-#define INT_LEAST8_MIN (-128)
-#define INT_LEAST8_MAX 127
-#define UINT_LEAST8_MAX 255
+#define INT_LEAST8_MIN INT8_MIN
+#define INT_LEAST8_MAX INT8_MAX
+#define UINT_LEAST8_MAX UINT8_MAX
-#define INT_LEAST16_MIN (-32768)
-#define INT_LEAST16_MAX 32767
-#define UINT_LEAST16_MAX 65535
+#define INT_LEAST16_MIN INT16_MIN
+#define INT_LEAST16_MAX INT16_MAX
+#define UINT_LEAST16_MAX UINT16_MAX
-#define INT_LEAST32_MIN (-2147483648)
-#define INT_LEAST32_MAX 2147483647
-#define UINT_LEAST32_MAX 4294967295U
+#define INT_LEAST32_MIN INT32_MIN
+#define INT_LEAST32_MAX INT32_MAX
+#define UINT_LEAST32_MAX UINT32_MAX
-#define INT_LEAST64_MIN (-9223372036854775808)
-#define INT_LEAST64_MAX 9223372036854775807
-#define UINT_LEAST64_MAX 18446744073709551615U
+#define INT_LEAST64_MIN INT64_MIN
+#define INT_LEAST64_MAX INT64_MAX
+#define UINT_LEAST64_MAX UINT64_MAX
-#define INT_FAST8_MIN (-2147483648)
-#define INT_FAST8_MAX 2147483647
-#define UINT_FAST8_MAX 4294967295U
+#define INT_FAST8_MIN INT32_MIN
+#define INT_FAST8_MAX INT32_MAX
+#define UINT_FAST8_MAX UINT32_MAX
-#define INT_FAST16_MIN (-2147483648)
-#define INT_FAST16_MAX 2147483647
-#define UINT_FAST16_MAX 4294967295U
+#define INT_FAST16_MIN INT32_MIN
+#define INT_FAST16_MAX INT32_MAX
+#define UINT_FAST16_MAX UINT32_MAX
-#define INT_FAST32_MIN (-2147483648)
-#define INT_FAST32_MAX 2147483647
-#define UINT_FAST32_MAX 4294967295U
+#define INT_FAST32_MIN INT32_MIN
+#define INT_FAST32_MAX INT32_MAX
+#define UINT_FAST32_MAX UINT32_MAX
-#define INT_FAST64_MIN (-9223372036854775808)
-#define INT_FAST64_MAX 9223372036854775807
-#define UINT_FAST64_MAX 18446744073709551615U
+#define INT_FAST64_MIN INT64_MIN
+#define INT_FAST64_MAX INT64_MAX
+#define UINT_FAST64_MAX UINT64_MAX
-#define INTPTR_MIN (-9223372036854775808)
-#define INTPTR_MAX 9223372036854775807
-#define UINTPTR_MAX 18446744073709551615U
+#define INTPTR_MIN INT64_MIN
+#define INTPTR_MAX INT64_MAX
+#define UINTPTR_MAX UINT64_MAX
-#define INTMAX_MIN (-9223372036854775808)
-#define INTMAX_MAX 9223372036854775807
-#define UINTMAX_MAX 18446744073709551615U
+#define INTMAX_MIN INT64_MIN
+#define INTMAX_MAX INT64_MAX
+#define UINTMAX_MAX UINT64_MAX
-#define PTRDIFF_MIN (-2147483648)
-#define PTRDIFF_MAX 2147483647
+#define PTRDIFF_MIN INT64_MIN
+#define PTRDIFF_MAX INT64_MAX
-#define SIG_ATOMIC_MIN (-2147483648)
-#define SIG_ATOMIC_MAX 2147483647
+#define SIG_ATOMIC_MIN INT32_MIN
+#define SIG_ATOMIC_MAX INT32_MAX
-#define SIZE_MAX 18446744073709551615U
+#define SIZE_MAX UINT64_MAX
-#define WCHAR_MIN (-2147483648)
-#define WCHAR_MAX 2147483647
+#define WCHAR_MIN INT32_MIN
+#define WCHAR_MAX INT32_MAX
#define INT8_C(x) x
#define INT16_C(x) x
@@ -87,7 +87,7 @@ typedef long int64_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
+typedef unsigned uint32_t;
typedef unsigned long uint64_t;
typedef signed char int8_least_t;
@@ -97,7 +97,7 @@ typedef long int64_least_t;
typedef unsigned char uint8_least_t;
typedef unsigned short uint16_least_t;
-typedef unsigned int uint32_least_t;
+typedef unsigned uint32_least_t;
typedef unsigned long uint64_least_t;
typedef int int8_fast_t;
diff --git a/libc/include/bits/i386-sysv/arch/stdint.h b/libc/include/bits/i386-sysv/arch/stdint.h
@@ -1,71 +1,71 @@
/* See LICENSE file for copyright and license details. */
-#define INT8_MIN (-128)
-#define INT8_MAX 127
-#define UINT8_MAX 255
+#define INT8_MAX 0x7F
+#define INT8_MIN (-INT8_MAX-1)
+#define UINT8_MAX 0xFF
-#define INT16_MIN (-32768)
-#define INT16_MAX 32767
-#define UINT16_MAX 65535
+#define INT16_MAX 0x7FFF
+#define INT16_MIN (-INT16_MAX-1)
+#define UINT16_MAX 0xFFFF
-#define INT32_MIN (-2147483648)
-#define INT32_MAX 2147483647
-#define UINT32_MAX 4294967295U
+#define INT32_MAX 0x7FFFFFFF
+#define INT32_MIN (-INT32_MAX-1)
+#define UINT32_MAX 0xFFFFFFFF
-#define INT64_MIN (-9223372036854775808)
-#define INT64_MAX 9223372036854775807
-#define UINT64_MAX 18446744073709551615U
+#define INT64_MAX 0x7FFFFFFFFFFFFFFF
+#define INT64_MIN (-INT64_MAX-1)
+#define UINT64_MAX 0xFFFFFFFFFFFFFFFF
-#define INT_LEAST8_MIN (-128)
-#define INT_LEAST8_MAX 127
-#define UINT_LEAST8_MAX 255
+#define INT_LEAST8_MIN INT8_MIN
+#define INT_LEAST8_MAX INT8_MAX
+#define UINT_LEAST8_MAX UINT8_MAX
-#define INT_LEAST16_MIN (-32768)
-#define INT_LEAST16_MAX 32767
-#define UINT_LEAST16_MAX 65535
+#define INT_LEAST16_MIN INT16_MIN
+#define INT_LEAST16_MAX INT16_MAX
+#define UINT_LEAST16_MAX UINT16_MAX
-#define INT_LEAST32_MIN (-2147483648)
-#define INT_LEAST32_MAX 2147483647
-#define UINT_LEAST32_MAX 4294967295U
+#define INT_LEAST32_MIN INT32_MIN
+#define INT_LEAST32_MAX INT32_MAX
+#define UINT_LEAST32_MAX UINT32_MAX
-#define INT_LEAST64_MIN (-9223372036854775808)
-#define INT_LEAST64_MAX 9223372036854775807
-#define UINT_LEAST64_MAX 18446744073709551615U
+#define INT_LEAST64_MIN INT64_MIN
+#define INT_LEAST64_MAX INT64_MAX
+#define UINT_LEAST64_MAX UINT64_MAX
-#define INT_FAST8_MIN (-2147483648)
-#define INT_FAST8_MAX 2147483647
-#define UINT_FAST8_MAX 4294967295U
+#define INT_FAST8_MIN INT32_MIN
+#define INT_FAST8_MAX INT32_MAX
+#define UINT_FAST8_MAX UINT32_MAX
-#define INT_FAST16_MIN (-2147483648)
-#define INT_FAST16_MAX 2147483647
-#define UINT_FAST16_MAX 4294967295U
+#define INT_FAST16_MIN INT32_MIN
+#define INT_FAST16_MAX INT32_MAX
+#define UINT_FAST16_MAX UINT32_MAX
-#define INT_FAST32_MIN (-2147483648)
-#define INT_FAST32_MAX 2147483647
-#define UINT_FAST32_MAX 4294967295U
+#define INT_FAST32_MIN INT32_MIN
+#define INT_FAST32_MAX INT32_MAX
+#define UINT_FAST32_MAX UINT32_MAX
-#define INT_FAST64_MIN (-9223372036854775808)
-#define INT_FAST64_MAX 9223372036854775807
-#define UINT_FAST64_MAX 18446744073709551615U
+#define INT_FAST64_MIN INT64_MIN
+#define INT_FAST64_MAX INT64_MAX
+#define UINT_FAST64_MAX UINT64_MAX
-#define INTPTR_MIN (-9223372036854775808)
-#define INTPTR_MAX 9223372036854775807
-#define UINTPTR_MAX 18446744073709551615U
+#define INTPTR_MIN INT32_MIN
+#define INTPTR_MAX INT32_MAX
+#define UINTPTR_MAX UINT32_MAX
-#define INTMAX_MIN (-9223372036854775808)
-#define INTMAX_MAX 9223372036854775807
-#define UINTMAX_MAX 18446744073709551615U
+#define INTMAX_MIN INT64_MIN
+#define INTMAX_MAX INT64_MAX
+#define UINTMAX_MAX UINT64_MAX
-#define PTRDIFF_MIN (-9223372036854775808)
-#define PTRDIFF_MAX 9223372036854775807
+#define PTRDIFF_MIN INT32_MIN
+#define PTRDIFF_MAX INT32_MAX
-#define SIG_ATOMIC_MIN (-2147483648)
-#define SIG_ATOMIC_MAX 2147483647
+#define SIG_ATOMIC_MIN INT32_MIN
+#define SIG_ATOMIC_MAX INT32_MAX
-#define SIZE_MAX 18446744073709551615U
+#define SIZE_MAX UINT32_MAX
-#define WCHAR_MIN (-2147483648)
-#define WCHAR_MAX 2147483647
+#define WCHAR_MIN INT32_MIN
+#define WCHAR_MAX INT32_MAX
#define INT8_C(x) x
#define INT16_C(x) x
@@ -110,9 +110,8 @@ typedef unsigned uint16_fast_t;
typedef unsigned uint32_fast_t;
typedef unsigned long long uint64_fast_t;
-typedef intptr_t long;
-typedef long long uintptr_t unsigned;
-
-typedef intmax_t long;
-typedef long long uintmax_t unsigned;
+typedef int intptr_t;
+typedef unsigned uintptr_t;
+typedef long long intmax_t;
+typedef unsigned long long uintmax_t;
diff --git a/libc/include/bits/qbe/arch/stdint.h b/libc/include/bits/qbe/arch/stdint.h
@@ -1,71 +1,71 @@
/* See LICENSE file for copyright and license details. */
-#define INT8_MIN (-128)
-#define INT8_MAX 127
-#define UINT8_MAX 255
+#define INT8_MAX 0x7F
+#define INT8_MIN (-INT8_MAX-1)
+#define UINT8_MAX 0xFF
-#define INT16_MIN (-32768)
-#define INT16_MAX 32767
-#define UINT16_MAX 65535
+#define INT16_MAX 0x7FFF
+#define INT16_MIN (-INT16_MAX-1)
+#define UINT16_MAX 0xFFFF
-#define INT32_MIN (-2147483648)
-#define INT32_MAX 2147483647
-#define UINT32_MAX 4294967295U
+#define INT32_MAX 0x7FFFFFFF
+#define INT32_MIN (-INT32_MAX-1)
+#define UINT32_MAX 0xFFFFFFFF
-#define INT64_MIN (-9223372036854775808)
-#define INT64_MAX 9223372036854775807
-#define UINT64_MAX 18446744073709551615U
+#define INT64_MAX 0x7FFFFFFFFFFFFFFF
+#define INT64_MIN (-INT64_MAX-1)
+#define UINT64_MAX 0xFFFFFFFFFFFFFFFF
-#define INT_LEAST8_MIN (-128)
-#define INT_LEAST8_MAX 127
-#define UINT_LEAST8_MAX 255
+#define INT_LEAST8_MIN INT8_MIN
+#define INT_LEAST8_MAX INT8_MAX
+#define UINT_LEAST8_MAX UINT8_MAX
-#define INT_LEAST16_MIN (-32768)
-#define INT_LEAST16_MAX 32767
-#define UINT_LEAST16_MAX 65535
+#define INT_LEAST16_MIN INT16_MIN
+#define INT_LEAST16_MAX INT16_MAX
+#define UINT_LEAST16_MAX UINT16_MAX
-#define INT_LEAST32_MIN (-2147483648)
-#define INT_LEAST32_MAX 2147483647
-#define UINT_LEAST32_MAX 4294967295U
+#define INT_LEAST32_MIN INT32_MIN
+#define INT_LEAST32_MAX INT32_MAX
+#define UINT_LEAST32_MAX UINT32_MAX
-#define INT_LEAST64_MIN (-9223372036854775808)
-#define INT_LEAST64_MAX 9223372036854775807
-#define UINT_LEAST64_MAX 18446744073709551615U
+#define INT_LEAST64_MIN INT64_MIN
+#define INT_LEAST64_MAX INT64_MAX
+#define UINT_LEAST64_MAX UINT64_MAX
-#define INT_FAST8_MIN (-2147483648)
-#define INT_FAST8_MAX 2147483647
-#define UINT_FAST8_MAX 4294967295U
+#define INT_FAST8_MIN INT32_MIN
+#define INT_FAST8_MAX INT32_MAX
+#define UINT_FAST8_MAX UINT32_MAX
-#define INT_FAST16_MIN (-2147483648)
-#define INT_FAST16_MAX 2147483647
-#define UINT_FAST16_MAX 4294967295U
+#define INT_FAST16_MIN INT32_MIN
+#define INT_FAST16_MAX INT32_MAX
+#define UINT_FAST16_MAX UINT32_MAX
-#define INT_FAST32_MIN (-2147483648)
-#define INT_FAST32_MAX 2147483647
-#define UINT_FAST32_MAX 4294967295U
+#define INT_FAST32_MIN INT32_MIN
+#define INT_FAST32_MAX INT32_MAX
+#define UINT_FAST32_MAX UINT32_MAX
-#define INT_FAST64_MIN (-9223372036854775808)
-#define INT_FAST64_MAX 9223372036854775807
-#define UINT_FAST64_MAX 18446744073709551615U
+#define INT_FAST64_MIN INT64_MIN
+#define INT_FAST64_MAX INT64_MAX
+#define UINT_FAST64_MAX UINT64_MAX
-#define INTPTR_MIN (-9223372036854775808)
-#define INTPTR_MAX 9223372036854775807
-#define UINTPTR_MAX 18446744073709551615U
+#define INTPTR_MIN INT64_MIN
+#define INTPTR_MAX INT64_MAX
+#define UINTPTR_MAX UINT64_MAX
-#define INTMAX_MIN (-9223372036854775808)
-#define INTMAX_MAX 9223372036854775807
-#define UINTMAX_MAX 18446744073709551615U
+#define INTMAX_MIN INT64_MIN
+#define INTMAX_MAX INT64_MAX
+#define UINTMAX_MAX UINT64_MAX
-#define PTRDIFF_MIN (-9223372036854775808)
-#define PTRDIFF_MAX 9223372036854775807
+#define PTRDIFF_MIN INT64_MIN
+#define PTRDIFF_MAX INT64_MAX
-#define SIG_ATOMIC_MIN (-2147483648)
-#define SIG_ATOMIC_MAX 2147483647
+#define SIG_ATOMIC_MIN INT32_MIN
+#define SIG_ATOMIC_MAX INT32_MAX
-#define SIZE_MAX 18446744073709551615U
+#define SIZE_MAX UINT64_MAX
-#define WCHAR_MIN (-2147483648)
-#define WCHAR_MAX 2147483647
+#define WCHAR_MIN INT32_MIN
+#define WCHAR_MAX INT32_MAX
#define INT8_C(x) x
#define INT16_C(x) x
@@ -87,7 +87,7 @@ typedef long int64_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
+typedef unsigned uint32_t;
typedef unsigned long uint64_t;
typedef signed char int8_least_t;
@@ -97,7 +97,7 @@ typedef long int64_least_t;
typedef unsigned char uint8_least_t;
typedef unsigned short uint16_least_t;
-typedef unsigned int uint32_least_t;
+typedef unsigned uint32_least_t;
typedef unsigned long uint64_least_t;
typedef int int8_fast_t;
diff --git a/libc/include/bits/z80/arch/stdint.h b/libc/include/bits/z80/arch/stdint.h
@@ -1,71 +1,71 @@
/* See LICENSE file for copyright and license details. */
-#define INT8_MIN (-128)
-#define INT8_MAX 127
-#define UINT8_MAX 255
+#define INT8_MAX 0x7F
+#define INT8_MIN (-INT8_MAX-1)
+#define UINT8_MAX 0xFF
-#define INT16_MIN (-32768)
-#define INT16_MAX 32767
-#define UINT16_MAX 65535U
+#define INT16_MAX 0x7FFF
+#define INT16_MIN (-INT16_MAX-1)
+#define UINT16_MAX 0xFFFF
-#define INT32_MIN (-2147483648)
-#define INT32_MAX 2147483647
-#define UINT32_MAX 4294967295U
+#define INT32_MAX 0x7FFFFFFF
+#define INT32_MIN (-INT32_MAX-1)
+#define UINT32_MAX 0xFFFFFFFF
-#define INT64_MIN (-9223372036854775808)
-#define INT64_MAX 9223372036854775807
-#define UINT64_MAX 18446744073709551615U
+#define INT64_MAX 0x7FFFFFFFFFFFFFFF
+#define INT64_MIN (-INT64_MAX-1)
+#define UINT64_MAX 0xFFFFFFFFFFFFFFFF
-#define INT_LEAST8_MIN (-128)
-#define INT_LEAST8_MAX 127
-#define UINT_LEAST8_MAX 255
+#define INT_LEAST8_MIN INT8_MIN
+#define INT_LEAST8_MAX INT8_MAX
+#define UINT_LEAST8_MAX UINT8_MAX
-#define INT_LEAST16_MIN (-32768)
-#define INT_LEAST16_MAX 32767
-#define UINT_LEAST16_MAX 65535U
+#define INT_LEAST16_MIN INT16_MIN
+#define INT_LEAST16_MAX INT16_MAX
+#define UINT_LEAST16_MAX UINT16_MAX
-#define INT_LEAST32_MIN (-2147483648)
-#define INT_LEAST32_MAX 2147483647
-#define UINT_LEAST32_MAX 4294967295U
+#define INT_LEAST32_MIN INT32_MIN
+#define INT_LEAST32_MAX INT32_MAX
+#define UINT_LEAST32_MAX UINT32_MAX
-#define INT_LEAST64_MIN (-9223372036854775808)
-#define INT_LEAST64_MAX 9223372036854775807
-#define UINT_LEAST64_MAX 18446744073709551615U
+#define INT_LEAST64_MIN INT64_MIN
+#define INT_LEAST64_MAX INT64_MAX
+#define UINT_LEAST64_MAX UINT64_MAX
-#define INT_FAST8_MIN (-32768)
-#define INT_FAST8_MAX 32767
-#define UINT_FAST8_MAX 65535U
+#define INT_FAST8_MIN INT16_MIN
+#define INT_FAST8_MAX INT16_MAX
+#define UINT_FAST8_MAX UINT16_MAX
-#define INT_FAST16_MIN (-32768)
-#define INT_FAST16_MAX 32767
-#define UINT_FAST16_MAX 65535U
+#define INT_FAST16_MIN INT16_MIN
+#define INT_FAST16_MAX INT16_MAX
+#define UINT_FAST16_MAX UINT16_MAX
-#define INT_FAST32_MIN (-2147483648)
-#define INT_FAST32_MAX 2147483647
-#define UINT_FAST32_MAX 4294967295U
+#define INT_FAST32_MIN INT32_MIN
+#define INT_FAST32_MAX INT32_MAX
+#define UINT_FAST32_MAX UINT32_MAX
-#define INT_FAST64_MIN (-9223372036854775808)
-#define INT_FAST64_MAX 9223372036854775807
-#define UINT_FAST64_MAX 18446744073709551615U
+#define INT_FAST64_MIN INT64_MIN
+#define INT_FAST64_MAX INT64_MAX
+#define UINT_FAST64_MAX UINT64_MAX
-#define INTPTR_MIN (-32768)
-#define INTPTR_MAX 32767
-#define UINTPTR_MAX 65535U
+#define INTPTR_MIN INT16_MIN
+#define INTPTR_MAX INT16_MAX
+#define UINTPTR_MAX UINT16_MAX
-#define INTMAX_MIN (-32768)
-#define INTMAX_MAX 32767
-#define UINTMAX_MAX 65535U
+#define INTMAX_MIN INT64_MIN
+#define INTMAX_MAX INT64_MAX
+#define UINTMAX_MAX UINT64_MAX
-#define PTRDIFF_MIN (-32768)
-#define PTRDIFF_MAX 32767
+#define PTRDIFF_MIN INT16_MIN
+#define PTRDIFF_MAX INT16_MAX
-#define SIG_ATOMIC_MIN (-128)
-#define SIG_ATOMIC_MAX 127
+#define SIG_ATOMIC_MIN INT16_MIN
+#define SIG_ATOMIC_MAX INT16_MAX
-#define SIZE_MAX 18446744073709551615U
+#define SIZE_MAX UINT64_MAX
-#define WCHAR_MIN (-32768)
-#define WCHAR_MAX 32767
+#define WCHAR_MIN INT16_MIN
+#define WCHAR_MAX INT16_MAX
#define INT8_C(x) x
#define INT16_C(x) x
