projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify some logic in scanf and remove redundant invalid-format check
[musl]
/
include
/
stdint.h
diff --git
a/include/stdint.h
b/include/stdint.h
index
8e187a5
..
7628404
100644
(file)
--- a/
include/stdint.h
+++ b/
include/stdint.h
@@
-11,16
+11,6
@@
#define __NEED_uint32_t
#define __NEED_uint64_t
#define __NEED_uint32_t
#define __NEED_uint64_t
-#define __NEED_int_least8_t
-#define __NEED_int_least16_t
-#define __NEED_int_least32_t
-#define __NEED_int_least64_t
-
-#define __NEED_uint_least8_t
-#define __NEED_uint_least16_t
-#define __NEED_uint_least32_t
-#define __NEED_uint_least64_t
-
#define __NEED_int_fast8_t
#define __NEED_int_fast16_t
#define __NEED_int_fast32_t
#define __NEED_int_fast8_t
#define __NEED_int_fast16_t
#define __NEED_int_fast32_t
@@
-33,6
+23,7
@@
#define __NEED_intptr_t
#define __NEED_uintptr_t
#define __NEED_intptr_t
#define __NEED_uintptr_t
+
#define __NEED_intmax_t
#define __NEED_uintmax_t
#define __NEED_intmax_t
#define __NEED_uintmax_t
@@
-48,22
+39,20
@@
typedef uint16_t uint_least16_t;
typedef uint32_t uint_least32_t;
typedef uint64_t uint_least64_t;
typedef uint32_t uint_least32_t;
typedef uint64_t uint_least64_t;
-#if !defined __cplusplus || defined __STDC_LIMIT_MACROS
-
#define INT8_MIN (-1-0x7f)
#define INT16_MIN (-1-0x7fff)
#define INT32_MIN (-1-0x7fffffff)
#define INT8_MIN (-1-0x7f)
#define INT16_MIN (-1-0x7fff)
#define INT32_MIN (-1-0x7fffffff)
-#define INT64_MIN (-1-0x7fffffffffffffff
LL
)
+#define INT64_MIN (-1-0x7fffffffffffffff)
#define INT8_MAX (0x7f)
#define INT16_MAX (0x7fff)
#define INT32_MAX (0x7fffffff)
#define INT8_MAX (0x7f)
#define INT16_MAX (0x7fff)
#define INT32_MAX (0x7fffffff)
-#define INT64_MAX (0x7fffffffffffffff
LL
)
+#define INT64_MAX (0x7fffffffffffffff)
#define UINT8_MAX (0xff)
#define UINT16_MAX (0xffff)
#define UINT32_MAX (0xffffffff)
#define UINT8_MAX (0xff)
#define UINT16_MAX (0xffff)
#define UINT32_MAX (0xffffffff)
-#define UINT64_MAX (0xffffffffffffffff
ULL
)
+#define UINT64_MAX (0xffffffffffffffff)
#define INT_LEAST8_MIN INT8_MIN
#define INT_LEAST16_MIN INT16_MIN
#define INT_LEAST8_MIN INT8_MIN
#define INT_LEAST16_MIN INT16_MIN
@@
-80,38
+69,41
@@
typedef uint64_t uint_least64_t;
#define UINT_LEAST32_MAX UINT32_MAX
#define UINT_LEAST64_MAX UINT64_MAX
#define UINT_LEAST32_MAX UINT32_MAX
#define UINT_LEAST64_MAX UINT64_MAX
-#undef WCHAR_MIN
-#undef WCHAR_MAX
-#undef WINT_MIN
-#undef WINT_MAX
-#define WCHAR_MIN INT32_MIN
-#define WCHAR_MAX INT32_MAX
-#define WINT_MIN INT32_MIN
-#define WINT_MAX INT32_MAX
-
#define INTMAX_MIN INT64_MIN
#define INTMAX_MAX INT64_MAX
#define UINTMAX_MAX UINT64_MAX
#define INTMAX_MIN INT64_MIN
#define INTMAX_MAX INT64_MAX
#define UINTMAX_MAX UINT64_MAX
-#include <bits/stdint.h>
+#define WINT_MIN INT32_MIN
+#define WINT_MAX INT32_MAX
+#if L'\0'-1 > 0
+#define WCHAR_MAX (0xffffffffu+L'\0')
+#define WCHAR_MIN (0+L'\0')
+#else
+#define WCHAR_MAX (0x7fffffff+L'\0')
+#define WCHAR_MIN (-1-0x7fffffff+L'\0')
#endif
#endif
-#i
f !defined __cplusplus || defined __STDC_CONSTANT_MACROS
+#i
nclude <bits/stdint.h>
#define INT8_C(c) c
#define INT16_C(c) c
#define INT32_C(c) c
#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
## U
-#define UINT16_C(c) c
## U
+#define UINT8_C(c) c
+#define UINT16_C(c) c
#define UINT32_C(c) c ## U
#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
#define INTMAX_C(c) c ## LL
#define UINTMAX_C(c) c ## ULL
-
#endif
#endif
#endif
#endif