From bfce746a87e205a682b85e144e056029a8a30d07 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 31 Aug 1998 16:30:27 +0000 Subject: Update. 1998-08-31 15:56 Ulrich Drepper * db2/db_int.h: Use instead of "db.h" to find header in include. * include/stdio.h: Add __vsscanf. * libio/stdio.h: Make vfscanf, scanf, and vsscanf available if __USE_ISOC9X. Remove __vsscanf declaration. Always declare fgetpos and fsetpos. * math/math.h: Define isinf as macro. * math/bits/mathcalls.h: Change to declare __isinf all the time. Don't declare scalb for ISO C 9x. * math/tgmath.h: Define fma. Rewrite the underlying macros. * stdlib/stdlib.h: Declare strtof and strtold is __USE_ISOC9X. * sysdeps/unix/sysv/linux/bits/sigcontext.h: Allow inclusion from sys/ucontext.h. * sysdeps/wordsize-32/inttypes.h: Define missing PRI* and SCN* macros. 1998-08-31 Andreas Jaeger * sysdeps/standalone/bits/errno.h (ENOMSG): Remove duplicate. Reported by jreising@frequentis.com [PR libc/767]. 1998-08-31 Andreas Jaeger * io/lockf.c (lockf): Move initilisation of fl.l_whence and fl.l_start at beginning of function. Patch by Geoff. Dash [PR libc/769]. --- sysdeps/wordsize-32/inttypes.h | 103 +++++++++++++++++++++++++++++++++-------- 1 file changed, 83 insertions(+), 20 deletions(-) (limited to 'sysdeps/wordsize-32') diff --git a/sysdeps/wordsize-32/inttypes.h b/sysdeps/wordsize-32/inttypes.h index 79d3eed31c..250cbe31dd 100644 --- a/sysdeps/wordsize-32/inttypes.h +++ b/sysdeps/wordsize-32/inttypes.h @@ -82,6 +82,22 @@ # define PRIoFAST32 "o" # define PRIoFAST64 "llo" +/* Unsigned integers. */ +# define PRIu8 "u" +# define PRIu16 "u" +# define PRIu32 "u" +# define PRIu64 "llu" + +# define PRIuLEAST8 "u" +# define PRIuLEAST16 "u" +# define PRIuLEAST32 "u" +# define PRIuLEAST64 "llu" + +# define PRIuFAST8 "u" +# define PRIuFAST16 "u" +# define PRIuFAST32 "u" +# define PRIuFAST64 "llu" + /* lowercase hexadecimal notation. */ # define PRIx8 "x" # define PRIx16 "x" @@ -115,72 +131,119 @@ # define PRIXFAST64 "llX" -/* Unsigned integers. */ -# define PRIu8 "u" -# define PRIu16 "u" -# define PRIu32 "u" -# define PRIu64 "llu" - -# define PRIuLEAST8 "u" -# define PRIuLEAST16 "u" -# define PRIuLEAST32 "u" -# define PRIuLEAST64 "llu" - -# define PRIuFAST8 "u" -# define PRIuFAST16 "u" -# define PRIuFAST32 "u" -# define PRIuFAST64 "llu" - - /* Macros for printing `intmax_t' and `uintmax_t'. */ # define PRIdMAX "lld" +# define PRIiMAX "lli" # define PRIoMAX "llo" -# define PRIxMAX "llx" # define PRIuMAX "llu" +# define PRIxMAX "llx" +# define PRIXMAX "llX" /* Macros for printing `intptr_t' and `uintptr_t'. */ # define PRIdPTR "d" +# define PRIiPTR "i" # define PRIoPTR "o" -# define PRIxPTR "x" # define PRIuPTR "u" +# define PRIxPTR "x" +# define PRIXPTR "X" /* Macros for scanning format specifiers. */ -/* Decimal notation. */ +/* Signed decimal notation. */ # define SCNd8 "hhd" # define SCNd16 "hd" # define SCNd32 "d" # define SCNd64 "lld" +# define SCNdLEAST8 "hhd" +# define SCNdLEAST16 "hd" +# define SCNdLEAST32 "d" +# define SCNdLEAST64 "lld" + +# define SCNdFAST8 "hhd" +# define SCNdFAST16 "d" +# define SCNdFAST32 "d" +# define SCNdFAST64 "lld" + +/* Signed decimal notation. */ # define SCNi8 "hhi" # define SCNi16 "hi" # define SCNi32 "i" # define SCNi64 "lli" +# define SCNiLEAST8 "hhi" +# define SCNiLEAST16 "hi" +# define SCNiLEAST32 "i" +# define SCNiLEAST64 "lli" + +# define SCNiFAST8 "hhi" +# define SCNiFAST16 "i" +# define SCNiFAST32 "i" +# define SCNiFAST64 "lli" + +/* Unsigned decimal notation. */ # define SCNu8 "hhu" # define SCNu16 "hu" # define SCNu32 "u" # define SCNu64 "llu" +# define SCNuLEAST8 "hhu" +# define SCNuLEAST16 "hu" +# define SCNuLEAST32 "u" +# define SCNuLEAST64 "llu" + +# define SCNuFAST8 "hhu" +# define SCNuFAST16 "u" +# define SCNuFAST32 "u" +# define SCNuFAST64 "llu" + /* Octal notation. */ # define SCNo8 "hho" # define SCNo16 "ho" # define SCNo32 "o" # define SCNo64 "llo" +# define SCNoLEAST8 "hho" +# define SCNoLEAST16 "ho" +# define SCNoLEAST32 "o" +# define SCNoLEAST64 "llo" + +# define SCNoFAST8 "hho" +# define SCNoFAST16 "o" +# define SCNoFAST32 "o" +# define SCNoFAST64 "llo" + /* Hexadecimal notation. */ # define SCNx8 "hhx" # define SCNx16 "hx" # define SCNx32 "x" # define SCNx64 "llx" +# define SCNxLEAST8 "hhx" +# define SCNxLEAST16 "hx" +# define SCNxLEAST32 "x" +# define SCNxLEAST64 "llx" + +# define SCNxFAST8 "hhx" +# define SCNxFAST16 "x" +# define SCNxFAST32 "x" +# define SCNxFAST64 "llx" + + +/* Macros for scanning `intmax_t' and `uintmax_t'. */ +# define SCNdMAX "lld" +# define SCNiMAX "lli" +# define SCNoMAX "llo" +# define SCNuMAX "llu" +# define SCNxMAX "llx" /* Macros for scaning `intptr_t' and `uintptr_t'. */ # define SCNdPTR "d" # define SCNiPTR "i" # define SCNoPTR "o" +# define SCNuPTR "u" # define SCNxPTR "x" #endif /* C++ && format macros */ -- cgit 1.4.1