drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* include/inttypes.h: A few items like PRNdPTR and SCNdPTR need 64 

bitness specified when _WIN64 is defined.
This commit is contained in:
Earnie Boyd 2012-07-30 14:31:16 +00:00
parent 6e5de03578
commit 31938000a5
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/mingw/ChangeLog
View File

@ -2,6 +2,8 @@
* include/stdint.h: Include _mingw.h for the definition of __int64 when * include/stdint.h: Include _mingw.h for the definition of __int64 when
_WIN64 is defined. _WIN64 is defined.
* include/inttypes.h: A few items like PRNdPTR and SCNdPTR need 64
bitness specified when _WIN64 is defined.
2012-05-08 Keith Marshall <keithmarshall@users.sourceforge.net> 2012-05-08 Keith Marshall <keithmarshall@users.sourceforge.net>

39
winsup/mingw/include/inttypes.h
View File

@ -44,7 +44,6 @@ typedef struct {
#define PRIdFAST64 "I64d" #define PRIdFAST64 "I64d"
#define PRIdMAX "I64d" #define PRIdMAX "I64d"
#define PRIdPTR "d"
#define PRIi8 "i" #define PRIi8 "i"
#define PRIi16 "i" #define PRIi16 "i"
@ -62,7 +61,6 @@ typedef struct {
#define PRIiFAST64 "I64i" #define PRIiFAST64 "I64i"
#define PRIiMAX "I64i" #define PRIiMAX "I64i"
#define PRIiPTR "i"
#define PRIo8 "o" #define PRIo8 "o"
#define PRIo16 "o" #define PRIo16 "o"
@ -81,8 +79,6 @@ typedef struct {
#define PRIoMAX "I64o" #define PRIoMAX "I64o"
#define PRIoPTR "o"
/* fprintf macros for unsigned types */ /* fprintf macros for unsigned types */
#define PRIu8 "u" #define PRIu8 "u"
#define PRIu16 "u" #define PRIu16 "u"
@ -101,7 +97,6 @@ typedef struct {
#define PRIuFAST64 "I64u" #define PRIuFAST64 "I64u"
#define PRIuMAX "I64u" #define PRIuMAX "I64u"
#define PRIuPTR "u"
#define PRIx8 "x" #define PRIx8 "x"
#define PRIx16 "x" #define PRIx16 "x"
@ -119,7 +114,6 @@ typedef struct {
#define PRIxFAST64 "I64x" #define PRIxFAST64 "I64x"
#define PRIxMAX "I64x" #define PRIxMAX "I64x"
#define PRIxPTR "x"
#define PRIX8 "X" #define PRIX8 "X"
#define PRIX16 "X" #define PRIX16 "X"
@ -137,7 +131,22 @@ typedef struct {
#define PRIXFAST64 "I64X" #define PRIXFAST64 "I64X"
#define PRIXMAX "I64X" #define PRIXMAX "I64X"
#ifdef _WIN64
#define PRIdPTR "I64d"
#define PRIiPTR "I64i"
#define PRIoPTR "I64o"
#define PRIuPTR "I64u"
#define PRIxPTR "I64x"
#define PRIXPTR "I64X"
#else
#define PRIdPTR "d"
#define PRIiPTR "i"
#define PRIoPTR "o"
#define PRIuPTR "u"
#define PRIxPTR "x"
#define PRIXPTR "X" #define PRIXPTR "X"
#endif
/* /*
* fscanf macros for signed int types * fscanf macros for signed int types
@ -159,7 +168,6 @@ typedef struct {
#define SCNdFAST64 "I64d" #define SCNdFAST64 "I64d"
#define SCNdMAX "I64d" #define SCNdMAX "I64d"
#define SCNdPTR "d"
#define SCNi16 "hi" #define SCNi16 "hi"
#define SCNi32 "i" #define SCNi32 "i"
@ -174,7 +182,6 @@ typedef struct {
#define SCNiFAST64 "I64i" #define SCNiFAST64 "I64i"
#define SCNiMAX "I64i" #define SCNiMAX "I64i"
#define SCNiPTR "i"
#define SCNo16 "ho" #define SCNo16 "ho"
#define SCNo32 "o" #define SCNo32 "o"
@ -189,7 +196,6 @@ typedef struct {
#define SCNoFAST64 "I64o" #define SCNoFAST64 "I64o"
#define SCNoMAX "I64o" #define SCNoMAX "I64o"
#define SCNoPTR "o"
#define SCNx16 "hx" #define SCNx16 "hx"
#define SCNx32 "x" #define SCNx32 "x"
@ -204,8 +210,6 @@ typedef struct {
#define SCNxFAST64 "I64x" #define SCNxFAST64 "I64x"
#define SCNxMAX "I64x" #define SCNxMAX "I64x"
#define SCNxPTR "x"
/* fscanf macros for unsigned int types */ /* fscanf macros for unsigned int types */
@ -222,7 +226,20 @@ typedef struct {
#define SCNuFAST64 "I64u" #define SCNuFAST64 "I64u"
#define SCNuMAX "I64u" #define SCNuMAX "I64u"
#ifdef _WIN64
#define SCNdPTR "I64d"
#define SCNiPTR "I64i"
#define SCNoPTR "I64o"
#define SCNxPTR "I64x"
#define SCNuPTR "I64u"
#else
#define SCNdPTR "d"
#define SCNiPTR "i"
#define SCNoPTR "o"
#define SCNxPTR "x"
#define SCNuPTR "u" #define SCNuPTR "u"
#endif
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* /*