projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enhance build process to allow selective -O3 optimization
[musl]
/
include
/
inttypes.h
diff --git
a/include/inttypes.h
b/include/inttypes.h
index
13ba6e0
..
c51769f
100644
(file)
--- a/
include/inttypes.h
+++ b/
include/inttypes.h
@@
-5,6
+5,7
@@
extern "C" {
#endif
extern "C" {
#endif
+#include <features.h>
#include <stdint.h>
#define __NEED_wchar_t
#include <stdint.h>
#define __NEED_wchar_t
@@
-15,16
+16,17
@@
typedef struct { intmax_t quot, rem; } imaxdiv_t;
intmax_t imaxabs(intmax_t);
imaxdiv_t imaxdiv(intmax_t, intmax_t);
intmax_t imaxabs(intmax_t);
imaxdiv_t imaxdiv(intmax_t, intmax_t);
-intmax_t strtoimax(const char *
, char **
, int);
-uintmax_t strtoumax(const char *
, char **
, int);
+intmax_t strtoimax(const char *
__restrict, char **__restrict
, int);
+uintmax_t strtoumax(const char *
__restrict, char **__restrict
, int);
-intmax_t wcstoimax(const wchar_t *, wchar_t **, int);
-uintmax_t wcstoumax(const wchar_t *, wchar_t **, int);
-
-#if !defined __cplusplus || defined __STDC_FORMAT_MACROS
+intmax_t wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int);
+uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int);
+#if UINTPTR_MAX == UINT64_MAX
+#define __PRI64 "l"
+#else
#define __PRI64 "ll"
#define __PRI64 "ll"
-#
define __PRIPTR "l"
+#
endif
#define PRId8 "d"
#define PRId16 "d"
#define PRId8 "d"
#define PRId16 "d"
@@
-123,12
+125,12
@@
uintmax_t wcstoumax(const wchar_t *, wchar_t **, int);
#define PRIxMAX __PRI64 "x"
#define PRIXMAX __PRI64 "X"
#define PRIxMAX __PRI64 "x"
#define PRIXMAX __PRI64 "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 PRIdPTR
"l
d"
+#define PRIiPTR
"l
i"
+#define PRIoPTR
"l
o"
+#define PRIuPTR
"l
u"
+#define PRIxPTR
"l
x"
+#define PRIXPTR
"l
X"
#define SCNd8 "hhd"
#define SCNd16 "hd"
#define SCNd8 "hhd"
#define SCNd16 "hd"
@@
-141,8
+143,8
@@
uintmax_t wcstoumax(const wchar_t *, wchar_t **, int);
#define SCNdLEAST64 __PRI64 "d"
#define SCNdFAST8 "hhd"
#define SCNdLEAST64 __PRI64 "d"
#define SCNdFAST8 "hhd"
-#define SCNdFAST16
__PRIPTR
"d"
-#define SCNdFAST32
__PRIPTR
"d"
+#define SCNdFAST16 "d"
+#define SCNdFAST32 "d"
#define SCNdFAST64 __PRI64 "d"
#define SCNi8 "hhi"
#define SCNdFAST64 __PRI64 "d"
#define SCNi8 "hhi"
@@
-156,8
+158,8
@@
uintmax_t wcstoumax(const wchar_t *, wchar_t **, int);
#define SCNiLEAST64 __PRI64 "i"
#define SCNiFAST8 "hhi"
#define SCNiLEAST64 __PRI64 "i"
#define SCNiFAST8 "hhi"
-#define SCNiFAST16
__PRIPTR
"i"
-#define SCNiFAST32
__PRIPTR
"i"
+#define SCNiFAST16 "i"
+#define SCNiFAST32 "i"
#define SCNiFAST64 __PRI64 "i"
#define SCNu8 "hhu"
#define SCNiFAST64 __PRI64 "i"
#define SCNu8 "hhu"
@@
-171,8
+173,8
@@
uintmax_t wcstoumax(const wchar_t *, wchar_t **, int);
#define SCNuLEAST64 __PRI64 "u"
#define SCNuFAST8 "hhu"
#define SCNuLEAST64 __PRI64 "u"
#define SCNuFAST8 "hhu"
-#define SCNuFAST16
__PRIPTR
"u"
-#define SCNuFAST32
__PRIPTR
"u"
+#define SCNuFAST16 "u"
+#define SCNuFAST32 "u"
#define SCNuFAST64 __PRI64 "u"
#define SCNo8 "hho"
#define SCNuFAST64 __PRI64 "u"
#define SCNo8 "hho"
@@
-186,8
+188,8
@@
uintmax_t wcstoumax(const wchar_t *, wchar_t **, int);
#define SCNoLEAST64 __PRI64 "o"
#define SCNoFAST8 "hho"
#define SCNoLEAST64 __PRI64 "o"
#define SCNoFAST8 "hho"
-#define SCNoFAST16
__PRIPTR
"o"
-#define SCNoFAST32
__PRIPTR
"o"
+#define SCNoFAST16 "o"
+#define SCNoFAST32 "o"
#define SCNoFAST64 __PRI64 "o"
#define SCNx8 "hhx"
#define SCNoFAST64 __PRI64 "o"
#define SCNx8 "hhx"
@@
-201,8
+203,8
@@
uintmax_t wcstoumax(const wchar_t *, wchar_t **, int);
#define SCNxLEAST64 __PRI64 "x"
#define SCNxFAST8 "hhx"
#define SCNxLEAST64 __PRI64 "x"
#define SCNxFAST8 "hhx"
-#define SCNxFAST16
__PRIPTR
"x"
-#define SCNxFAST32
__PRIPTR
"x"
+#define SCNxFAST16 "x"
+#define SCNxFAST32 "x"
#define SCNxFAST64 __PRI64 "x"
#define SCNdMAX __PRI64 "d"
#define SCNxFAST64 __PRI64 "x"
#define SCNdMAX __PRI64 "d"
@@
-211,13
+213,11
@@
uintmax_t wcstoumax(const wchar_t *, wchar_t **, int);
#define SCNuMAX __PRI64 "u"
#define SCNxMAX __PRI64 "x"
#define SCNuMAX __PRI64 "u"
#define SCNxMAX __PRI64 "x"
-#define SCNdPTR __PRIPTR "d"
-#define SCNiPTR __PRIPTR "i"
-#define SCNoPTR __PRIPTR "o"
-#define SCNuPTR __PRIPTR "u"
-#define SCNxPTR __PRIPTR "x"
-
-#endif
+#define SCNdPTR "ld"
+#define SCNiPTR "li"
+#define SCNoPTR "lo"
+#define SCNuPTR "lu"
+#define SCNxPTR "lx"
#ifdef __cplusplus
}
#ifdef __cplusplus
}