projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mq_notify: block all (application) signals in the worker thread
[musl]
/
include
/
inttypes.h
diff --git
a/include/inttypes.h
b/include/inttypes.h
index
05d54ba
..
61dcb72
100644
(file)
--- a/
include/inttypes.h
+++ b/
include/inttypes.h
@@
-22,12
+22,12
@@
uintmax_t strtoumax(const char *__restrict, char **__restrict, int);
intmax_t wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int);
uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int);
intmax_t wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int);
uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int);
-#if !defined __cplusplus || defined __STDC_FORMAT_MACROS
-
#if UINTPTR_MAX == UINT64_MAX
#define __PRI64 "l"
#if UINTPTR_MAX == UINT64_MAX
#define __PRI64 "l"
+#define __PRIPTR "l"
#else
#define __PRI64 "ll"
#else
#define __PRI64 "ll"
+#define __PRIPTR ""
#endif
#define PRId8 "d"
#endif
#define PRId8 "d"
@@
-127,12
+127,12
@@
uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int);
#define PRIxMAX __PRI64 "x"
#define PRIXMAX __PRI64 "X"
#define PRIxMAX __PRI64 "x"
#define PRIXMAX __PRI64 "X"
-#define PRIdPTR
"l
d"
-#define PRIiPTR
"l
i"
-#define PRIoPTR
"l
o"
-#define PRIuPTR
"l
u"
-#define PRIxPTR
"l
x"
-#define PRIXPTR
"l
X"
+#define PRIdPTR
__PRIPTR "
d"
+#define PRIiPTR
__PRIPTR "
i"
+#define PRIoPTR
__PRIPTR "
o"
+#define PRIuPTR
__PRIPTR "
u"
+#define PRIxPTR
__PRIPTR "
x"
+#define PRIXPTR
__PRIPTR "
X"
#define SCNd8 "hhd"
#define SCNd16 "hd"
#define SCNd8 "hhd"
#define SCNd16 "hd"
@@
-215,13
+215,11
@@
uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int);
#define SCNuMAX __PRI64 "u"
#define SCNxMAX __PRI64 "x"
#define SCNuMAX __PRI64 "u"
#define SCNxMAX __PRI64 "x"
-#define SCNdPTR "ld"
-#define SCNiPTR "li"
-#define SCNoPTR "lo"
-#define SCNuPTR "lu"
-#define SCNxPTR "lx"
-
-#endif
+#define SCNdPTR __PRIPTR "d"
+#define SCNiPTR __PRIPTR "i"
+#define SCNoPTR __PRIPTR "o"
+#define SCNuPTR __PRIPTR "u"
+#define SCNxPTR __PRIPTR "x"
#ifdef __cplusplus
}
#ifdef __cplusplus
}