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/standalone/bits/errno.h | 3 +- sysdeps/unix/sysv/linux/Dist | 2 + sysdeps/unix/sysv/linux/bits/sigcontext.h | 11 +-- sysdeps/wordsize-32/inttypes.h | 103 +++++++++++++++++++++----- sysdeps/wordsize-64/inttypes.h | 117 ++++++++++++++++++++++-------- 5 files changed, 179 insertions(+), 57 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/standalone/bits/errno.h b/sysdeps/standalone/bits/errno.h index d4030b7..d4f7879 100644 --- a/sysdeps/standalone/bits/errno.h +++ b/sysdeps/standalone/bits/errno.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1994, 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -39,7 +39,6 @@ # define ENOMSG 11 # define ENAMETOOLONG 12 # define ELOOP 13 -# define ENOMSG 14 # define E2BIG 15 # define EINTR 16 # define ENOEXEC 18 diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist index dbe401d..e10e24a 100644 --- a/sysdeps/unix/sysv/linux/Dist +++ b/sysdeps/unix/sysv/linux/Dist @@ -77,3 +77,5 @@ xstatconv.c getdents64.c getresuid.c getresgid.c +umount.S +umount2.S diff --git a/sysdeps/unix/sysv/linux/bits/sigcontext.h b/sysdeps/unix/sysv/linux/bits/sigcontext.h index 08960b6..97cbf4b 100644 --- a/sysdeps/unix/sysv/linux/bits/sigcontext.h +++ b/sysdeps/unix/sysv/linux/bits/sigcontext.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,13 +16,14 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SIGNAL_H +#if !defined _SIGNAL_H && !defined _SYS_UCONTEXT_H # error "Never use directly; include instead." #endif - +#ifndef sigcontext_struct /* Kernel headers before 2.1.1 define a struct sigcontext_struct, but we need sigcontext. */ -#define sigcontext_struct sigcontext +# define sigcontext_struct sigcontext -#include +# include +#endif diff --git a/sysdeps/wordsize-32/inttypes.h b/sysdeps/wordsize-32/inttypes.h index 79d3eed..250cbe3 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 */ diff --git a/sysdeps/wordsize-64/inttypes.h b/sysdeps/wordsize-64/inttypes.h index c76d2c8..61730bb 100644 --- a/sysdeps/wordsize-64/inttypes.h +++ b/sysdeps/wordsize-64/inttypes.h @@ -82,6 +82,22 @@ # define PRIoFAST32 "o" # define PRIoFAST64 "lo" + /* Unsigned integers. */ +# define PRIu8 "u" +# define PRIu16 "u" +# define PRIu32 "u" +# define PRIu64 "lu" + +# define PRIuLEAST8 "u" +# define PRIuLEAST16 "u" +# define PRIuLEAST32 "u" +# define PRIuLEAST64 "lu" + +# define PRIuFAST8 "u" +# define PRIuFAST16 "u" +# define PRIuFAST32 "u" +# define PRIuFAST64 "lu" + /* lowercase hexadecimal notation. */ # define PRIx8 "x" # define PRIx16 "x" @@ -115,54 +131,57 @@ # define PRIXFAST64 "lX" -/* Unsigned integers. */ -# define PRIu8 "u" -# define PRIu16 "u" -# define PRIu32 "u" -# define PRIu64 "lu" - -# define PRIuLEAST8 "u" -# define PRIuLEAST16 "u" -# define PRIuLEAST32 "u" -# define PRIuLEAST64 "lu" - -# define PRIuFAST8 "u" -# define PRIuFAST16 "u" -# define PRIuFAST32 "u" -# define PRIuFAST64 "lu" - - /* Macros for printing `intmax_t' and `uintmax_t'. */ # define PRIdMAX "ld" +# define PRIiMAX "li" # define PRIoMAX "lo" -# define PRIxMAX "lx" # define PRIuMAX "lu" +# define PRIxMAX "lx" +# define PRIXMAX "lX" /* Macros for printing `intptr_t' and `uintptr_t'. */ # define PRIdPTR "ld" +# define PRIiPTR "li" # define PRIoPTR "lo" -# define PRIxPTR "lx" # define PRIuPTR "lu" +# define PRIxPTR "lx" +# define PRIXPTR "lX" /* Macros for printing format specifiers. */ -/* Decimal notation. */ +/* Signed decimal notation. */ # define SCNd8 "hhd" # define SCNd16 "hd" # define SCNd32 "d" # define SCNd64 "ld" +# define SCNdLEAST8 "hhd" +# define SCNdLEAST16 "hd" +# define SCNdLEAST32 "d" +# define SCNdLEAST64 "ld" + +# define SCNdFAST8 "hhd" +# define SCNdFAST16 "ld" +# define SCNdFAST32 "ld" +# define SCNdFAST64 "ld" + +/* Signed decimal notation. */ # define SCNi8 "hhi" # define SCNi16 "hi" # define SCNi32 "i" # define SCNi64 "li" -# define SCNu8 "hhu" -# define SCNu16 "hu" -# define SCNu32 "u" -# define SCNu64 "lu" +# define SCNiLEAST8 "hhi" +# define SCNiLEAST16 "hi" +# define SCNiLEAST32 "i" +# define SCNiLEAST64 "li" + +# define SCNiFAST8 "hhi" +# define SCNiFAST16 "li" +# define SCNiFAST32 "li" +# define SCNiFAST64 "li" /* Octal notation. */ # define SCNo8 "hho" @@ -170,23 +189,61 @@ # define SCNo32 "o" # define SCNo64 "lo" +# define SCNoLEAST8 "hho" +# define SCNoLEAST16 "ho" +# define SCNoLEAST32 "o" +# define SCNoLEAST64 "lo" + +# define SCNoFAST8 "hho" +# define SCNoFAST16 "lo" +# define SCNoFAST32 "lo" +# define SCNoFAST64 "lo" + +/* Unsigned decimal notation. */ +# define SCNu8 "hhu" +# define SCNu16 "hu" +# define SCNu32 "u" +# define SCNu64 "lu" + +# define SCNuLEAST8 "hhu" +# define SCNuLEAST16 "hu" +# define SCNuLEAST32 "u" +# define SCNuLEAST64 "lu" + +# define SCNuFAST8 "hhu" +# define SCNuFAST16 "lu" +# define SCNuFAST32 "lu" +# define SCNuFAST64 "lu" + /* Hexadecimal notation. */ # define SCNx8 "hhx" # define SCNx16 "hx" # define SCNx32 "x" # define SCNx64 "lx" +# define SCNxLEAST8 "hhx" +# define SCNxLEAST16 "hx" +# define SCNxLEAST32 "x" +# define SCNxLEAST64 "lx" + +# define SCNxFAST8 "hhx" +# define SCNxFAST16 "lx" +# define SCNxFAST32 "lx" +# define SCNxFAST64 "lx" + -/* Macros for scaning `intfast_t' and `uintfast_t'. */ -# define SCNdFAST "ld" -# define SCNiFAST "li" -# define SCNoFAST "lo" -# define SCNxFAST "lx" +/* Macros for scanning `intmax_t' and `uintmax_t'. */ +# define SCNdMAX "ld" +# define SCNiMAX "li" +# define SCNoMAX "lo" +# define SCNuMAX "lu" +# define SCNxMAX "lx" -/* Macros for scaning `intptr_t' and `uintptr_t'. */ +/* Macros for scanning `intptr_t' and `uintptr_t'. */ # define SCNdPTR "ld" # define SCNiPTR "li" # define SCNoPTR "lo" +# define SCNuPTR "lu" # define SCNxPTR "lx" #endif /* C++ && format macros */ -- cgit v1.1