Browse Source

Update {PRN,SCN}*PTR defines to match types changes

OPENBSD_3_9
millert 19 years ago
parent
commit
f8ff83b550
1 changed files with 1 additions and 45 deletions
  1. +1
    -45
      src/include/inttypes.h

+ 1
- 45
src/include/inttypes.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: inttypes.h,v 1.7 2006/01/13 17:58:09 millert Exp $ */
/* $OpenBSD: inttypes.h,v 1.8 2006/01/15 00:46:07 millert Exp $ */
/* /*
* Copyright (c) 1997, 2005 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 1997, 2005 Todd C. Miller <Todd.Miller@courtesan.com>
@ -55,11 +55,7 @@
#define PRIdFAST64 "lld" #define PRIdFAST64 "lld"
#define PRIdMAX "jd" #define PRIdMAX "jd"
#ifdef __LP64__
#define PRIdPTR "ld" #define PRIdPTR "ld"
#else
#define PRIdPTR "d"
#endif
#define PRIi8 "i" #define PRIi8 "i"
#define PRIi16 "i" #define PRIi16 "i"
@ -77,11 +73,7 @@
#define PRIiFAST64 "lli" #define PRIiFAST64 "lli"
#define PRIiMAX "ji" #define PRIiMAX "ji"
#ifdef __LP64__
#define PRIiPTR "li" #define PRIiPTR "li"
#else
#define PRIiPTR "i"
#endif
/* fprintf macros for unsigned integers */ /* fprintf macros for unsigned integers */
#define PRIo8 "o" #define PRIo8 "o"
@ -100,11 +92,7 @@
#define PRIoFAST64 "llo" #define PRIoFAST64 "llo"
#define PRIoMAX "jo" #define PRIoMAX "jo"
#ifdef __LP64__
#define PRIoPTR "lo" #define PRIoPTR "lo"
#else
#define PRIoPTR "o"
#endif
#define PRIu8 "u" #define PRIu8 "u"
#define PRIu16 "u" #define PRIu16 "u"
@ -122,11 +110,7 @@
#define PRIuFAST64 "llu" #define PRIuFAST64 "llu"
#define PRIuMAX "ju" #define PRIuMAX "ju"
#ifdef __LP64__
#define PRIuPTR "lu" #define PRIuPTR "lu"
#else
#define PRIuPTR "u"
#endif
#define PRIx8 "x" #define PRIx8 "x"
#define PRIx16 "x" #define PRIx16 "x"
@ -144,11 +128,7 @@
#define PRIxFAST64 "llx" #define PRIxFAST64 "llx"
#define PRIxMAX "jx" #define PRIxMAX "jx"
#ifdef __LP64__
#define PRIxPTR "lx" #define PRIxPTR "lx"
#else
#define PRIxPTR "x"
#endif
#define PRIX8 "X" #define PRIX8 "X"
#define PRIX16 "X" #define PRIX16 "X"
@ -166,11 +146,7 @@
#define PRIXFAST64 "llX" #define PRIXFAST64 "llX"
#define PRIXMAX "jX" #define PRIXMAX "jX"
#ifdef __LP64__
#define PRIXPTR "lX" #define PRIXPTR "lX"
#else
#define PRIXPTR "X"
#endif
/* fscanf macros for signed integers */ /* fscanf macros for signed integers */
#define SCNd8 "hhd" #define SCNd8 "hhd"
@ -189,11 +165,7 @@
#define SCNdFAST64 "lld" #define SCNdFAST64 "lld"
#define SCNdMAX "jd" #define SCNdMAX "jd"
#ifdef __LP64__
#define SCNdPTR "ld" #define SCNdPTR "ld"
#else
#define SCNdPTR "d"
#endif
#define SCNi8 "hhi" #define SCNi8 "hhi"
#define SCNi16 "hi" #define SCNi16 "hi"
@ -211,11 +183,7 @@
#define SCNiFAST64 "lli" #define SCNiFAST64 "lli"
#define SCNiMAX "ji" #define SCNiMAX "ji"
#ifdef __LP64__
#define SCNiPTR "li" #define SCNiPTR "li"
#else
#define SCNiPTR "i"
#endif
/* fscanf macros for unsigned integers */ /* fscanf macros for unsigned integers */
#define SCNo8 "hho" #define SCNo8 "hho"
@ -234,11 +202,7 @@
#define SCNoFAST64 "llo" #define SCNoFAST64 "llo"
#define SCNoMAX "jo" #define SCNoMAX "jo"
#ifdef __LP64__
#define SCNoPTR "lo" #define SCNoPTR "lo"
#else
#define SCNoPTR "o"
#endif
#define SCNu8 "hhu" #define SCNu8 "hhu"
#define SCNu16 "hu" #define SCNu16 "hu"
@ -256,11 +220,7 @@
#define SCNuFAST64 "llu" #define SCNuFAST64 "llu"
#define SCNuMAX "ju" #define SCNuMAX "ju"
#ifdef __LP64__
#define SCNuPTR "lu" #define SCNuPTR "lu"
#else
#define SCNuPTR "u"
#endif
#define SCNx8 "hhx" #define SCNx8 "hhx"
#define SCNx16 "hx" #define SCNx16 "hx"
@ -278,11 +238,7 @@
#define SCNxFAST64 "llx" #define SCNxFAST64 "llx"
#define SCNxMAX "jx" #define SCNxMAX "jx"
#ifdef __LP64__
#define SCNxPTR "lx" #define SCNxPTR "lx"
#else
#define SCNxPTR "x"
#endif
#endif /* __cplusplus || __STDC_FORMAT_MACROS */ #endif /* __cplusplus || __STDC_FORMAT_MACROS */


Loading…
Cancel
Save