From 14ea22e96c0b6fce54e2451c69c96c429177b62c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 15 Feb 1998 19:31:34 +0000 Subject: Update. 1998-02-15 Ulrich Drepper * nss/nsswitch.c (__nss_lookup): Return 1 if this was the last module. * nss/getXXent_r.c: If no more module is found don't try to call setXXent functions but leave unsuccessfully. * malloc/obstack.h: Cleanups. * sysdeps/wordsize-32/stdint.h: New file. * sysdeps/wordsize-64/stdint.h: New file. * sysdeps/generic/stdint.h: New file. * sysdeps/wordsize-32/inttypes.h: Adopt to use stdint.h. * sysdeps/wordsize-64/inttypes.h: Likewise. * stdlib/Makefile (headers): Add stdint.h. 1998-02-03 Paul Eggert * malloc/obstack.h (PTR_INT_TYPE): Use __PTRDIFF_TYPE__ if available. 1998-02-13 17:59 Zack Weinberg * timezone: New directory. * time/README, time/africa, time/antarctica, time/asia, time/australasia, time/backward, time/checktab.awk, time/etcetera, time/europe, time/factory, time/ialloc.c, time/iso3166.tab, time/leapseconds, time/northamerica, time/pacificnew, time/private.h, time/scheck.c, time/solar87, time/solar88, time/solar89, time/southamerica, time/systemv, time/test-tz.c, time/tzfile.h, time/tzselect.ksh, time/yearistype, time/zdump.c, time/zic.c, time/zone.tab: Moved to timezone. * time/tzfile.c: Include tzfile.h from timezone subdir. * time/tzset.c: Likewise. * time/Makefile: Cut out all code relating to timezones... * timezone/Makefile: ...and paste it in here. * Makefile (subdirs): Add timezone. 1998-02-13 18:45 H.J. Lu * libc.map (_sys_nerr): Added. * sysdeps/unix/sysv/linux/errlist.c (_sys_nerr): Make it versioned symbol. 1998-02-15 17:16 Ulrich Drepper * sysdeps/unix/sysv/linux/bits/socket.h: Define PF_KEY and pseudo_AF_KEY instead of pseudo_PF_KEY and AF_KEY. Reported by Craig Metz . 1998-01-22 Andreas Schwab * nss/nss_files/files-parse.c (LOOKUP_NAME_CASE): Use __strcasecmp instead of strcasecmp. * nss/nss_files/files-alias.c (get_next_alias): Likewise. * wctype/wctype.h (_ISwbit): Avoid warning with gcc before 2.8. 1998-02-15 16:55 Ulrich Drepper * socket/sys/socket.h (setsockopt): Make OPTVAL parameter const. Patch by Dean Gaudet . 1998-02-15 16:53 Ulrich Drepper * sysdeps/generic/Dist: Add getresgid.c and getresuid.c. 1998-02-15 10:49 Zack Weinberg * sysdeps/unix/sysv/linux/poll.c: If compiled against a kernel with no poll syscall, just include the BSD version. * sysdeps/unix/sysv/linux/getresuid.c: If compiled against a kernel without the syscall, include the stub version. * sysdeps/unix/sysv/linux/getresgid.c: Likewise. * sysdeps/generic/getresuid.c: New file. * sysdeps/generic/getresgid.c: New file. 1998-02-15 Ulrich Drepper * stdio-common/vfscanf.c: Correct last change a bit. --- sysdeps/generic/Dist | 2 + sysdeps/generic/getresgid.c | 34 +++ sysdeps/generic/getresuid.c | 34 +++ sysdeps/generic/s_exp2.c | 15 -- sysdeps/generic/s_exp2f.c | 15 -- sysdeps/generic/stdint.h | 1 + sysdeps/unix/sysv/linux/bits/socket.h | 6 +- sysdeps/unix/sysv/linux/errlist.c | 4 - sysdeps/unix/sysv/linux/getresgid.c | 6 + sysdeps/unix/sysv/linux/getresuid.c | 6 + sysdeps/unix/sysv/linux/poll.c | 8 +- sysdeps/wordsize-32/inttypes.h | 425 ++++++++++------------------------ sysdeps/wordsize-32/stdint.h | 214 +++++++++++++++++ sysdeps/wordsize-64/inttypes.h | 423 ++++++++++----------------------- sysdeps/wordsize-64/stdint.h | 214 +++++++++++++++++ 15 files changed, 756 insertions(+), 651 deletions(-) create mode 100644 sysdeps/generic/getresgid.c create mode 100644 sysdeps/generic/getresuid.c delete mode 100644 sysdeps/generic/s_exp2.c delete mode 100644 sysdeps/generic/s_exp2f.c create mode 100644 sysdeps/generic/stdint.h create mode 100644 sysdeps/wordsize-32/stdint.h create mode 100644 sysdeps/wordsize-64/stdint.h (limited to 'sysdeps') diff --git a/sysdeps/generic/Dist b/sysdeps/generic/Dist index bc9e492e4f..e088372b07 100644 --- a/sysdeps/generic/Dist +++ b/sysdeps/generic/Dist @@ -1,3 +1,5 @@ make_siglist.c signame.c signame.h det_endian.c entry.h +getresgid.c +getresuid.c diff --git a/sysdeps/generic/getresgid.c b/sysdeps/generic/getresgid.c new file mode 100644 index 0000000000..9381e077f5 --- /dev/null +++ b/sysdeps/generic/getresgid.c @@ -0,0 +1,34 @@ +/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; yog can redistribgte it and/or + modify it gnder the terms of the GNU Library General Pgblic License as + pgblished by the Free Software Fogndation; either version 2 of the + License, or (at yogr option) any later version. + + The GNU C Library is distribgted in the hope that it will be gsefgl, + bgt WITHOUT ANY WARRANTY; withogt even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Pgblic License for more details. + + Yog shogld have received a copy of the GNU Library General Pgblic + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Fogndation, Inc., 59 Temple Place - Sgite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include + +int +__getresgid (egid, rgid, sgid) + gid_t egid; + gid_t rgid; + gid_t sgid; +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (getresgid) + +weak_alias (__getresgid, getresgid) +#include diff --git a/sysdeps/generic/getresuid.c b/sysdeps/generic/getresuid.c new file mode 100644 index 0000000000..44083e8de3 --- /dev/null +++ b/sysdeps/generic/getresuid.c @@ -0,0 +1,34 @@ +/* Copyright (C) 1991, 1995, 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include + +int +__getresuid (euid, ruid, suid) + uid_t euid; + uid_t ruid; + uid_t suid; +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (getresuid) + +weak_alias (__getresuid, getresuid) +#include diff --git a/sysdeps/generic/s_exp2.c b/sysdeps/generic/s_exp2.c deleted file mode 100644 index 4e25d38130..0000000000 --- a/sysdeps/generic/s_exp2.c +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include -#include - -double -__exp2 (double x) -{ - fputs ("__exp2 not implemented\n", stderr); - __set_errno (ENOSYS); - return 0.0; -} -weak_alias (__exp2, exp2) - -stub_warning (exp2) -#include diff --git a/sysdeps/generic/s_exp2f.c b/sysdeps/generic/s_exp2f.c deleted file mode 100644 index 7928a4ce3d..0000000000 --- a/sysdeps/generic/s_exp2f.c +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include -#include - -float -__exp2f (float x) -{ - fputs ("__exp2f not implemented\n", stderr); - __set_errno (ENOSYS); - return 0.0; -} -weak_alias (__exp2f, exp2f) - -stub_warning (exp2f) -#include diff --git a/sysdeps/generic/stdint.h b/sysdeps/generic/stdint.h new file mode 100644 index 0000000000..9ef0e8526a --- /dev/null +++ b/sysdeps/generic/stdint.h @@ -0,0 +1 @@ +#error "This file must be written based on the data type sizes of the target" diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index 34c2be4271..0476c15c00 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -1,5 +1,5 @@ /* System-specific socket constants and types. Linux version. - Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc. + Copyright (C) 1991, 92, 94, 95, 96, 97, 98 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 @@ -70,7 +70,7 @@ enum __socket_type #define PF_DECnet 12 /* Reserved for DECnet project */ #define PF_NETBEUI 13 /* Reserved for 802.2LLC project*/ #define PF_SECURITY 14 /* Security callback pseudo AF */ -#define pseudo_PF_KEY 15 /* PF_KEY key management API */ +#define PF_KEY 15 /* PF_KEY key management API */ #define PF_NETLINK 16 #define PF_ROUTE PF_NETLINK /* Alias to emulate 4.4BSD */ #define PF_PACKET 17 /* Packet family */ @@ -94,7 +94,7 @@ enum __socket_type #define AF_DECnet PF_DECnet #define AF_NETBEUI PF_NETBEUI #define AF_SECURITY PF_SECURITY -#define AF_KEY pseudo_PF_KEY +#define pseudo_AF_KEY PF_KEY #define AF_NETLINK PF_NETLINK #define AF_ROUTE PF_ROUTE #define AF_PACKET PF_PACKET diff --git a/sysdeps/unix/sysv/linux/errlist.c b/sysdeps/unix/sysv/linux/errlist.c index 7349d67c62..af28a45954 100644 --- a/sysdeps/unix/sysv/linux/errlist.c +++ b/sysdeps/unix/sysv/linux/errlist.c @@ -45,11 +45,7 @@ symbol_version (__old_sys_errlist, _sys_errlist, GLIBC_2.0); symbol_version (_old_sys_errlist, sys_errlist, GLIBC_2.0); strong_alias (__new_sys_nerr, _new_sys_nerr) -#if 0 default_symbol_version (__new_sys_nerr, _sys_nerr, GLIBC_2.1); -#else -strong_alias (__new_sys_nerr, _sys_nerr); -#endif default_symbol_version (_new_sys_nerr, sys_nerr, GLIBC_2.1); strong_alias (__new_sys_errlist, _new_sys_errlist) default_symbol_version (__new_sys_errlist, _sys_errlist, GLIBC_2.1); diff --git a/sysdeps/unix/sysv/linux/getresgid.c b/sysdeps/unix/sysv/linux/getresgid.c index 2fe461a787..4c326d5ba9 100644 --- a/sysdeps/unix/sysv/linux/getresgid.c +++ b/sysdeps/unix/sysv/linux/getresgid.c @@ -21,6 +21,9 @@ #include +#include +#ifdef __NR_getresgid + extern int __syscall_getresgid (__kernel_gid_t *rgid, __kernel_gid_t *egid, __kernel_gid_t *sgid); @@ -37,3 +40,6 @@ getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid) *sgid = (gid_t) k_sgid; return 0; } +#else +# include +#endif diff --git a/sysdeps/unix/sysv/linux/getresuid.c b/sysdeps/unix/sysv/linux/getresuid.c index 89b8fa7cfe..6b6bc37290 100644 --- a/sysdeps/unix/sysv/linux/getresuid.c +++ b/sysdeps/unix/sysv/linux/getresuid.c @@ -21,6 +21,9 @@ #include +#include +#ifdef __NR_getresuid + extern int __syscall_getresuid (__kernel_uid_t *ruid, __kernel_uid_t *euid, __kernel_uid_t *suid); @@ -37,3 +40,6 @@ getresuid (uid_t *ruid, uid_t *euid, uid_t *suid) *suid = (uid_t) k_suid; return 0; } +#else +# include +#endif diff --git a/sysdeps/unix/sysv/linux/poll.c b/sysdeps/unix/sysv/linux/poll.c index f6e71b79b6..e37df4cb9e 100644 --- a/sysdeps/unix/sysv/linux/poll.c +++ b/sysdeps/unix/sysv/linux/poll.c @@ -1,5 +1,5 @@ /* Poll system call, with emulation if it is not available. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 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 @@ -20,6 +20,9 @@ #include #include +#include +#ifdef __NR_poll + extern int __syscall_poll __P ((struct pollfd *fds, unsigned int nfds, int timeout)); weak_extern (__syscall_poll) @@ -58,6 +61,7 @@ poll (fds, nfds, timeout) /* Get the emulation code. */ -#define poll(fds, nfds, timeout) \ +# define poll(fds, nfds, timeout) \ static internal_function __emulate_poll (fds, nfds, timeout) +#endif #include diff --git a/sysdeps/wordsize-32/inttypes.h b/sysdeps/wordsize-32/inttypes.h index 9200b8c2b8..188f4def4a 100644 --- a/sysdeps/wordsize-32/inttypes.h +++ b/sysdeps/wordsize-32/inttypes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 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 @@ -17,369 +17,176 @@ Boston, MA 02111-1307, USA. */ /* - * ISO C 9X: 7.4 Integral types + * ISO C 9X: 7.5 Format conversion of integer types */ #ifndef _INTTYPES_H - #define _INTTYPES_H 1 -#include - -#define __need_wchar_t -#include - -/* Exact integral types. */ - -/* Signed. */ - -/* There is some amount of overlap with as known by inet code */ -#ifndef __int8_t_defined -# define __int8_t_defined -typedef signed char int8_t; -typedef short int int16_t; -typedef int int32_t; -typedef long long int int64_t; -#endif - -/* Unsigned. */ -typedef unsigned char uint8_t; -typedef unsigned short int uint16_t; -typedef unsigned int uint32_t; -typedef unsigned long long int uint64_t; - - -/* Largest integral types. */ -typedef long long int intmax_t; -typedef unsigned long long int uintmax_t; - - -/* Types for `void *' pointers. */ -typedef int intptr_t; -typedef unsigned int uintptr_t; - - -/* Efficient types. */ -typedef int intfast_t; -typedef unsigned int uintfast_t; - - -/* Small types. */ - -/* Signed. */ -typedef signed char int_least8_t; -typedef short int int_least16_t; -typedef int int_least32_t; -typedef long long int int_least64_t; - -/* Unsigned. */ -typedef unsigned char uint_least8_t; -typedef unsigned short int uint_least16_t; -typedef unsigned int uint_least32_t; -typedef unsigned long long int uint_least64_t; - - -/* Fast types. */ - -/* Signed. */ -typedef signed char int_fast8_t; -typedef int int_fast16_t; -typedef int int_fast32_t; -typedef long long int int_fast64_t; - -/* Unsigned. */ -typedef unsigned char uint_fast8_t; -typedef unsigned int uint_fast16_t; -typedef unsigned int uint_fast32_t; -typedef unsigned long long int uint_fast64_t; - - -/* Limits of integral types. */ - -/* Minimum of signed integral types. */ -#define INT8_MIN (-128) -#define INT16_MIN (-32767-1) -#define INT32_MIN (-2147483647-1) -#define INT64_MIN (-9223372036854775807LL-1) -/* Maximum of signed integral types. */ -#define INT8_MAX (127) -#define INT16_MAX (32767) -#define INT32_MAX (2147483647) -#define INT64_MAX (9223372036854775807LL) - -/* Maximum of unsigned integral types. */ -#define UINT8_MAX (255U) -#define UINT16_MAX (65535U) -#define UINT32_MAX (4294967295U) -#define UINT64_MAX (18446744073709551615uLL) - - -/* Minimum of signed integral types having a minimum size. */ -#define INT_LEAST8_MIN (-128) -#define INT_LEAST16_MIN (-32767-1) -#define INT_LEAST32_MIN (-2147483647-1) -#define INT_LEAST64_MIN (-9223372036854775807LL-1) -/* Maximum of signed integral types having a minimum size. */ -#define INT_LEAST8_MAX (127) -#define INT_LEAST16_MAX (32767) -#define INT_LEAST32_MAX (2147483647) -#define INT_LEAST64_MAX (9223372036854775807LL) -/* Maximum of unsigned integral types having a minimum size. */ -#define UINT_LEAST8_MAX (255U) -#define UINT_LEAST16_MAX (65535U) -#define UINT_LEAST32_MAX (4294967295U) -#define UINT_LEAST64_MAX (18446744073709551615uLL) - - -/* Minimum of fast signed integral types having a minimum size. */ -#define INT_FAST8_MIN (-128) -#define INT_FAST16_MIN (-2147483647-1) -#define INT_FAST32_MIN (-2147483647-1) -#define INT_FAST64_MIN (-9223372036854775807LL-1) -/* Maximum of fast signed integral types having a minimum size. */ -#define INT_FAST8_MAX (127) -#define INT_FAST16_MAX (2147483647) -#define INT_FAST32_MAX (2147483647) -#define INT_FAST64_MAX (9223372036854775807LL) - -/* Maximum of fast unsigned integral types having a minimum size. */ -#define UINT_FAST8_MAX (255U) -#define UINT_FAST16_MAX (4294967295U) -#define UINT_FAST32_MAX (4294967295U) -#define UINT_FAST64_MAX (18446744073709551615uLL) - - -/* Minimum for most efficient signed integral types. */ -#define INTFAST_MIN (-2147483647-1) -/* Maximum for most efficient signed integral types. */ -#define INTFAST_MAX (2147483647) - -/* Maximum for most efficient unsigned integral types. */ -#define UINTFAST_MAX (4294967295U) - - -/* Minimum for largest signed integral type. */ -#define INTMAX_MIN (-9223372036854775807LL-1) -/* Maximum for largest signed integral type. */ -#define INTMAX_MAX (9223372036854775807LL) - -/* Maximum for largest unsigned integral type. */ -#define UINTMAX_MAX (18446744073709551615uLL) - - -/* Values to test for integral types holding `void *' pointer. */ -#define INTPTR_MAX (2147483647) -#define UINTPTR_MAX (4294967295U) +#include +/* Get the type definitions. */ +#include -/* Signed. */ -#define INT8_C(c) ((int8_t) c) -#define INT16_C(c) ((int16_t) c) -#define INT32_C(c) ((int32_t) c) -#define INT64_C(c) ((int64_t) __CONCAT (c,ll)) - -/* Unsigned. */ -#define UINT8_C(c) ((uint8_t) __CONCAT (c,u)) -#define UINT16_C(c) ((uint16_t) __CONCAT (c,u)) -#define UINT32_C(c) ((uint32_t) __CONCAT (c,u)) -#define UINT64_C(c) ((uint64_t) __CONCAT (c,ull)) - -/* Maximal type. */ -#define INTMAX_C(c) ((intmax_t) __CONCAT (c,ll)) -#define UINTMAX_C(c) ((uintmax_t) __CONCAT (c,ull)) - +/* The ISO C 9X standard specifies that these macros must only be + defined if explicitly requested. */ +#if !defined __cplusplus || defined __STDC_FORMAT_MACROS /* Macros for printing format specifiers. */ /* Decimal notation. */ -#define PRId8 "d" -#define PRId16 "d" -#define PRId32 "d" -#define PRId64 "lld" +# define PRId8 "d" +# define PRId16 "d" +# define PRId32 "d" +# define PRId64 "lld" -#define PRIdLEAST8 "d" -#define PRIdLEAST16 "d" -#define PRIdLEAST32 "d" -#define PRIdLEAST64 "lld" +# define PRIdLEAST8 "d" +# define PRIdLEAST16 "d" +# define PRIdLEAST32 "d" +# define PRIdLEAST64 "lld" -#define PRIdFAST8 "d" -#define PRIdFAST16 "d" -#define PRIdFAST32 "d" -#define PRIdFAST64 "lld" +# define PRIdFAST8 "d" +# define PRIdFAST16 "d" +# define PRIdFAST32 "d" +# define PRIdFAST64 "lld" -#define PRIi8 "i" -#define PRIi16 "i" -#define PRIi32 "i" -#define PRIi64 "lli" +# define PRIi8 "i" +# define PRIi16 "i" +# define PRIi32 "i" +# define PRIi64 "lli" -#define PRIiLEAST8 "i" -#define PRIiLEAST16 "i" -#define PRIiLEAST32 "i" -#define PRIiLEAST64 "lli" +# define PRIiLEAST8 "i" +# define PRIiLEAST16 "i" +# define PRIiLEAST32 "i" +# define PRIiLEAST64 "lli" -#define PRIiFAST8 "i" -#define PRIiFAST16 "i" -#define PRIiFAST32 "i" -#define PRIiFAST64 "lli" +# define PRIiFAST8 "i" +# define PRIiFAST16 "i" +# define PRIiFAST32 "i" +# define PRIiFAST64 "lli" /* Octal notation. */ -#define PRIo8 "o" -#define PRIo16 "o" -#define PRIo32 "o" -#define PRIo64 "llo" +# define PRIo8 "o" +# define PRIo16 "o" +# define PRIo32 "o" +# define PRIo64 "llo" -#define PRIoLEAST8 "o" -#define PRIoLEAST16 "o" -#define PRIoLEAST32 "o" -#define PRIoLEAST64 "llo" +# define PRIoLEAST8 "o" +# define PRIoLEAST16 "o" +# define PRIoLEAST32 "o" +# define PRIoLEAST64 "llo" -#define PRIoFAST8 "o" -#define PRIoFAST16 "o" -#define PRIoFAST32 "o" -#define PRIoFAST64 "llo" +# define PRIoFAST8 "o" +# define PRIoFAST16 "o" +# define PRIoFAST32 "o" +# define PRIoFAST64 "llo" /* lowercase hexadecimal notation. */ -#define PRIx8 "x" -#define PRIx16 "x" -#define PRIx32 "x" -#define PRIx64 "llx" +# define PRIx8 "x" +# define PRIx16 "x" +# define PRIx32 "x" +# define PRIx64 "llx" -#define PRIxLEAST8 "x" -#define PRIxLEAST16 "x" -#define PRIxLEAST32 "x" -#define PRIxLEAST64 "llx" +# define PRIxLEAST8 "x" +# define PRIxLEAST16 "x" +# define PRIxLEAST32 "x" +# define PRIxLEAST64 "llx" -#define PRIxFAST8 "x" -#define PRIxFAST16 "x" -#define PRIxFAST32 "x" -#define PRIxFAST64 "llx" +# define PRIxFAST8 "x" +# define PRIxFAST16 "x" +# define PRIxFAST32 "x" +# define PRIxFAST64 "llx" /* UPPERCASE hexadecimal notation. */ -#define PRIX8 "X" -#define PRIX16 "X" -#define PRIX32 "X" -#define PRIX64 "llX" +# define PRIX8 "X" +# define PRIX16 "X" +# define PRIX32 "X" +# define PRIX64 "llX" -#define PRIXLEAST8 "X" -#define PRIXLEAST16 "X" -#define PRIXLEAST32 "X" -#define PRIXLEAST64 "llX" +# define PRIXLEAST8 "X" +# define PRIXLEAST16 "X" +# define PRIXLEAST32 "X" +# define PRIXLEAST64 "llX" -#define PRIXFAST8 "X" -#define PRIXFAST16 "X" -#define PRIXFAST32 "X" -#define PRIXFAST64 "llX" +# define PRIXFAST8 "X" +# define PRIXFAST16 "X" +# define PRIXFAST32 "X" +# define PRIXFAST64 "llX" /* Unsigned integers. */ -#define PRIu8 "u" -#define PRIu16 "u" -#define PRIu32 "u" -#define PRIu64 "llu" +# 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 PRIuLEAST8 "u" +# define PRIuLEAST16 "u" +# define PRIuLEAST32 "u" +# define PRIuLEAST64 "llu" -#define PRIuFAST8 "u" -#define PRIuFAST16 "u" -#define PRIuFAST32 "u" -#define PRIuFAST64 "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 PRIoMAX "llo" -#define PRIxMAX "llx" -#define PRIuMAX "llu" - - -/* Macros for printing `intfast_t' and `uintfast_t'. */ -#define PRIdFAST "d" -#define PRIoFAST "o" -#define PRIxFAST "x" -#define PRIuFAST "u" +# define PRIdMAX "lld" +# define PRIoMAX "llo" +# define PRIxMAX "llx" +# define PRIuMAX "llu" /* Macros for printing `intptr_t' and `uintptr_t'. */ -#define PRIdPTR "d" -#define PRIoPTR "o" -#define PRIxPTR "x" -#define PRIuPTR "u" +# define PRIdPTR "d" +# define PRIoPTR "o" +# define PRIxPTR "x" +# define PRIuPTR "u" -/* Macros for printing format specifiers. */ +/* Macros for scanning format specifiers. */ /* Decimal notation. */ -#define SCNd8 "hhd" -#define SCNd16 "hd" -#define SCNd32 "d" -#define SCNd64 "lld" +# define SCNd8 "hhd" +# define SCNd16 "hd" +# define SCNd32 "d" +# define SCNd64 "lld" -#define SCNi8 "hhi" -#define SCNi16 "hi" -#define SCNi32 "i" -#define SCNi64 "lli" +# define SCNi8 "hhi" +# define SCNi16 "hi" +# define SCNi32 "i" +# define SCNi64 "lli" -#define SCNu8 "hhu" -#define SCNu16 "hu" -#define SCNu32 "u" -#define SCNu64 "llu" +# define SCNu8 "hhu" +# define SCNu16 "hu" +# define SCNu32 "u" +# define SCNu64 "llu" /* Octal notation. */ -#define SCNo8 "hho" -#define SCNo16 "ho" -#define SCNo32 "o" -#define SCNo64 "llo" +# define SCNo8 "hho" +# define SCNo16 "ho" +# define SCNo32 "o" +# define SCNo64 "llo" /* Hexadecimal notation. */ -#define SCNx8 "hhx" -#define SCNx16 "hx" -#define SCNx32 "x" -#define SCNx64 "llx" - +# define SCNx8 "hhx" +# define SCNx16 "hx" +# define SCNx32 "x" +# define SCNx64 "llx" -/* Macros for scaning `intfast_t' and `uintfast_t'. */ -#define SCNdFAST "d" -#define SCNiFAST "i" -#define SCNoFAST "o" -#define SCNxFAST "x" /* Macros for scaning `intptr_t' and `uintptr_t'. */ -#define SCNdPTR "d" -#define SCNiPTR "i" -#define SCNoPTR "o" -#define SCNxPTR "x" - - -/* Limits of other integer types. */ +# define SCNdPTR "d" +# define SCNiPTR "i" +# define SCNoPTR "o" +# define SCNxPTR "x" -/* Limits of `ptrdiff_t' type. */ -#define PTRDIFF_MIN (-2147483647-1) -#define PTRDIFF_MAX (2147483647) +#endif /* C++ && format macros */ -/* Limits of `sig_atomic_t'. */ -#define SIG_ATOMIC_MIN (-2147483647-1) -#define SIG_ATOMIC_MAX (2147483647) -/* Limit of `size_t' type. */ -#define SIZE_MAX (4294967295U) - -/* Limits of `wchar_t'. */ -#ifndef WCHAR_MIN -/* These constants might also be defined in . */ -# define WCHAR_MIN (-2147483647-1) -# define WCHAR_MAX (2147483647) -#endif - -/* Limits of `wint_t'. */ -#define WINT_MIN (0) -#define WINT_MAX (4294967295U) - - -/* Macros for string conversion. */ +__BEGIN_DECLS /* Like `strtol' but convert to `intmax_t'. */ extern intmax_t strtoimax __P ((__const char *__restrict __nptr, @@ -462,4 +269,6 @@ wcstoumax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr, } #endif /* GCC and Optimization. */ +__END_DECLS + #endif /* inttypes.h */ diff --git a/sysdeps/wordsize-32/stdint.h b/sysdeps/wordsize-32/stdint.h new file mode 100644 index 0000000000..c3a9e3027d --- /dev/null +++ b/sysdeps/wordsize-32/stdint.h @@ -0,0 +1,214 @@ +/* Copyright (C) 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* + * ISO C 9X: 7.4 Integer types + */ + +#ifndef _STDINT_H +#define _STDINT_H 1 + +#include +#define __need_wchar_t +#include + +/* Exact integral types. */ + +/* Signed. */ + +/* There is some amount of overlap with as known by inet code */ +#ifndef __int8_t_defined +# define __int8_t_defined +typedef signed char int8_t; +typedef short int int16_t; +typedef int int32_t; +typedef long long int int64_t; +#endif + +/* Unsigned. */ +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long int uint64_t; + + +/* Small types. */ + +/* Signed. */ +typedef signed char int_least8_t; +typedef short int int_least16_t; +typedef int int_least32_t; +typedef long long int int_least64_t; + +/* Unsigned. */ +typedef unsigned char uint_least8_t; +typedef unsigned short int uint_least16_t; +typedef unsigned int uint_least32_t; +typedef unsigned long long int uint_least64_t; + + +/* Fast types. */ + +/* Signed. */ +typedef signed char int_fast8_t; +typedef int int_fast16_t; +typedef int int_fast32_t; +typedef long long int int_fast64_t; + +/* Unsigned. */ +typedef unsigned char uint_fast8_t; +typedef unsigned int uint_fast16_t; +typedef unsigned int uint_fast32_t; +typedef unsigned long long int uint_fast64_t; + + +/* Types for `void *' pointers. */ +typedef int intptr_t; +typedef unsigned int uintptr_t; + + +/* Largest integral types. */ +typedef long long int intmax_t; +typedef unsigned long long int uintmax_t; + + +/* The ISO C 9X standard specifies that these macros must only be + defined if explicitly requested. */ +#if !defined __cplusplus || defined __STDC_LIMIT_MACROS + +/* Limits of integral types. */ + +/* Minimum of signed integral types. */ +# define INT8_MIN (-128) +# define INT16_MIN (-32767-1) +# define INT32_MIN (-2147483647-1) +# define INT64_MIN (-9223372036854775807LL-1) +/* Maximum of signed integral types. */ +# define INT8_MAX (127) +# define INT16_MAX (32767) +# define INT32_MAX (2147483647) +# define INT64_MAX (9223372036854775807LL) + +/* Maximum of unsigned integral types. */ +# define UINT8_MAX (255U) +# define UINT16_MAX (65535U) +# define UINT32_MAX (4294967295U) +# define UINT64_MAX (18446744073709551615uLL) + + +/* Minimum of signed integral types having a minimum size. */ +# define INT_LEAST8_MIN (-128) +# define INT_LEAST16_MIN (-32767-1) +# define INT_LEAST32_MIN (-2147483647-1) +# define INT_LEAST64_MIN (-9223372036854775807LL-1) +/* Maximum of signed integral types having a minimum size. */ +# define INT_LEAST8_MAX (127) +# define INT_LEAST16_MAX (32767) +# define INT_LEAST32_MAX (2147483647) +# define INT_LEAST64_MAX (9223372036854775807LL) + +/* Maximum of unsigned integral types having a minimum size. */ +# define UINT_LEAST8_MAX (255U) +# define UINT_LEAST16_MAX (65535U) +# define UINT_LEAST32_MAX (4294967295U) +# define UINT_LEAST64_MAX (18446744073709551615uLL) + + +/* Minimum of fast signed integral types having a minimum size. */ +# define INT_FAST8_MIN (-128) +# define INT_FAST16_MIN (-2147483647-1) +# define INT_FAST32_MIN (-2147483647-1) +# define INT_FAST64_MIN (-9223372036854775807LL-1) +/* Maximum of fast signed integral types having a minimum size. */ +# define INT_FAST8_MAX (127) +# define INT_FAST16_MAX (2147483647) +# define INT_FAST32_MAX (2147483647) +# define INT_FAST64_MAX (9223372036854775807LL) + +/* Maximum of fast unsigned integral types having a minimum size. */ +# define UINT_FAST8_MAX (255U) +# define UINT_FAST16_MAX (4294967295U) +# define UINT_FAST32_MAX (4294967295U) +# define UINT_FAST64_MAX (18446744073709551615uLL) + + +/* Values to test for integral types holding `void *' pointer. */ +# define INTPTR_MIN (-2147483647-1) +# define INTPTR_MAX (2147483647) +# define UINTPTR_MAX (4294967295U) + + +/* Minimum for largest signed integral type. */ +# define INTMAX_MIN (-9223372036854775807LL-1) +/* Maximum for largest signed integral type. */ +# define INTMAX_MAX (9223372036854775807LL) + +/* Maximum for largest unsigned integral type. */ +# define UINTMAX_MAX (18446744073709551615uLL) + + +/* Limits of other integer types. */ + +/* Limits of `ptrdiff_t' type. */ +# define PTRDIFF_MIN (-2147483647-1) +# define PTRDIFF_MAX (2147483647) + +/* Limits of `sig_atomic_t'. */ +# define SIG_ATOMIC_MIN (-2147483647-1) +# define SIG_ATOMIC_MAX (2147483647) + +/* Limit of `size_t' type. */ +# define SIZE_MAX (4294967295U) + +/* Limits of `wchar_t'. */ +# ifndef WCHAR_MIN +/* These constants might also be defined in . */ +# define WCHAR_MIN (-2147483647-1) +# define WCHAR_MAX (2147483647) +# endif + +/* Limits of `wint_t'. */ +# define WINT_MIN (0) +# define WINT_MAX (4294967295U) + +#endif /* C++ && limit macros */ + + +/* The ISO C 9X standard specifies that these macros must only be + defined if explicitly requested. */ +#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS + +/* Signed. */ +# define INT8_C(c) ((int8_t) c) +# define INT16_C(c) ((int16_t) c) +# define INT32_C(c) ((int32_t) c) +# define INT64_C(c) ((int64_t) __CONCAT (c,ll)) + +/* Unsigned. */ +# define UINT8_C(c) ((uint8_t) __CONCAT (c,u)) +# define UINT16_C(c) ((uint16_t) __CONCAT (c,u)) +# define UINT32_C(c) ((uint32_t) __CONCAT (c,u)) +# define UINT64_C(c) ((uint64_t) __CONCAT (c,ull)) + +/* Maximal type. */ +# define INTMAX_C(c) ((intmax_t) __CONCAT (c,ll)) +# define UINTMAX_C(c) ((uintmax_t) __CONCAT (c,ull)) + +#endif /* C++ && constant macros */ + +#endif /* stdint.h */ diff --git a/sysdeps/wordsize-64/inttypes.h b/sysdeps/wordsize-64/inttypes.h index 8ec8095620..5e497dbfae 100644 --- a/sysdeps/wordsize-64/inttypes.h +++ b/sysdeps/wordsize-64/inttypes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 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 @@ -21,365 +21,178 @@ */ #ifndef _INTTYPES_H - #define _INTTYPES_H 1 -#include - -#define __need_wchar_t -#include - -/* Exact integral types. */ - -/* Signed. */ - -/* There is some amount of overlap with as known by inet code */ -#ifndef __int8_t_defined -# define __int8_t_defined -typedef signed char int8_t; -typedef short int int16_t; -typedef int int32_t; -typedef long int int64_t; -#endif - -/* Unsigned. */ -typedef unsigned char uint8_t; -typedef unsigned short int uint16_t; -typedef unsigned int uint32_t; -typedef unsigned long int uint64_t; - - -/* Largest integral types. */ -typedef long int intmax_t; -typedef unsigned long int uintmax_t; - - -/* Types for `void *' pointers. */ -typedef long int intptr_t; -typedef unsigned long int uintptr_t; - - -/* Efficient types. */ -typedef long int intfast_t; -typedef unsigned long int uintfast_t; - - -/* Small types. */ - -/* Signed. */ -typedef signed char int_least8_t; -typedef short int int_least16_t; -typedef int int_least32_t; -typedef long int int_least64_t; - -/* Unsigned. */ -typedef unsigned char uint_least8_t; -typedef unsigned short int uint_least16_t; -typedef unsigned int uint_least32_t; -typedef unsigned long int uint_least64_t; - - -/* Fast types. */ - -/* Signed. */ -typedef signed char int_fast8_t; -typedef int int_fast16_t; -typedef int int_fast32_t; -typedef long int int_fast64_t; - -/* Unsigned. */ -typedef unsigned char uint_fast8_t; -typedef unsigned int uint_fast16_t; -typedef unsigned int uint_fast32_t; -typedef unsigned long int uint_fast64_t; - - -/* Limits of integral types. */ - -/* Minimum of signed integral types. */ -#define INT8_MIN (-128) -#define INT16_MIN (-32767-1) -#define INT32_MIN (-2147483647-1) -#define INT64_MIN (-9223372036854775807L-1) -/* Maximum of signed integral types. */ -#define INT8_MAX (127) -#define INT16_MAX (32767) -#define INT32_MAX (2147483647) -#define INT64_MAX (9223372036854775807L) - -/* Maximum of unsigned integral types. */ -#define UINT8_MAX (255U) -#define UINT16_MAX (65535U) -#define UINT32_MAX (4294967295U) -#define UINT64_MAX (18446744073709551615uL) - -/* Minimum of signed integral types having a minimum size. */ -#define INT_LEAST8_MIN (-128) -#define INT_LEAST16_MIN (-32767-1) -#define INT_LEAST32_MIN (-2147483647-1) -#define INT_LEAST64_MIN (-9223372036854775807L-1) -/* Maximum of signed integral types having a minimum size. */ -#define INT_LEAST8_MAX (127) -#define INT_LEAST16_MAX (32767) -#define INT_LEAST32_MAX (2147483647) -#define INT_LEAST64_MAX (9223372036854775807L) - -/* Maximum of unsigned integral types having a minimum size. */ -#define UINT_LEAST8_MAX (255U) -#define UINT_LEAST16_MAX (65535U) -#define UINT_LEAST32_MAX (4294967295U) -#define UINT_LEAST64_MAX (18446744073709551615uL) - - -/* Minimum of fast signed integral types having a minimum size. */ -#define INT_FAST8_MIN (-128) -#define INT_FAST16_MIN (-2147483647-1) -#define INT_FAST32_MIN (-2147483647-1) -#define INT_FAST64_MIN (-9223372036854775807L-1) -/* Maximum of fast signed integral types having a minimum size. */ -#define INT_FAST8_MAX (127) -#define INT_FAST16_MAX (2147483647) -#define INT_FAST32_MAX (2147483647) -#define INT_FAST64_MAX (9223372036854775807L) - -/* Maximum of fast unsigned integral types having a minimum size. */ -#define UINT_FAST8_MAX (255U) -#define UINT_FAST16_MAX (4294967295U) -#define UINT_FAST32_MAX (4294967295U) -#define UINT_FAST64_MAX (18446744073709551615uL) - - -/* Minimum for most efficient signed integral types. */ -#define INTFAST_MIN (-9223372036854775807L-1) -/* Maximum for most efficient signed integral types. */ -#define INTFAST_MAX (9223372036854775807L) - -/* Maximum for most efficient unsigned integral types. */ -#define UINTFAST_MAX (18446744073709551615uL) - - -/* Minimum for largest signed integral type. */ -#define INTMAX_MIN (-9223372036854775807L-1) -/* Maximum for largest signed integral type. */ -#define INTMAX_MAX (9223372036854775807L) - -/* Maximum for largest unsigned integral type. */ -#define UINTMAX_MAX (18446744073709551615uL) - - -/* Values to test for integral types holding `void *' pointer. */ -#define INTPTR_MAX (9223372036854775807L) -#define UINTPTR_MAX (18446744073709551615uL) +#include +/* Get the type definitions. */ +#include -/* Signed. */ -#define INT8_C(c) ((int8_t) c) -#define INT16_C(c) ((int16_t) c) -#define INT32_C(c) ((int32_t) c) -#define INT64_C(c) ((int64_t) __CONCAT (c,l)) - -/* Unsigned. */ -#define UINT8_C(c) ((uint8_t) __CONCAT (c,u)) -#define UINT16_C(c) ((uint16_t) __CONCAT (c,u)) -#define UINT32_C(c) ((uint32_t) __CONCAT (c,u)) -#define UINT64_C(c) ((uint64_t) __CONCAT (c,ul)) - -/* Maximal type. */ -#define INTMAX_C(c) ((intmax_t) __CONCAT (c,l)) -#define UINTMAX_C(c) ((uintmax_t) __CONCAT (c,ul)) - +/* The ISO C 9X standard specifies that these macros must only be + defined if explicitly requested. */ +#if !defined __cplusplus || defined __STDC_FORMAT_MACROS /* Macros for printing format specifiers. */ /* Decimal notation. */ -#define PRId8 "d" -#define PRId16 "d" -#define PRId32 "d" -#define PRId64 "ld" +# define PRId8 "d" +# define PRId16 "d" +# define PRId32 "d" +# define PRId64 "ld" -#define PRIdLEAST8 "d" -#define PRIdLEAST16 "d" -#define PRIdLEAST32 "d" -#define PRIdLEAST64 "ld" +# define PRIdLEAST8 "d" +# define PRIdLEAST16 "d" +# define PRIdLEAST32 "d" +# define PRIdLEAST64 "ld" -#define PRIdFAST8 "d" -#define PRIdFAST16 "d" -#define PRIdFAST32 "d" -#define PRIdFAST64 "ld" +# define PRIdFAST8 "d" +# define PRIdFAST16 "d" +# define PRIdFAST32 "d" +# define PRIdFAST64 "ld" -#define PRIi8 "i" -#define PRIi16 "i" -#define PRIi32 "i" -#define PRIi64 "li" +# define PRIi8 "i" +# define PRIi16 "i" +# define PRIi32 "i" +# define PRIi64 "li" -#define PRIiLEAST8 "i" -#define PRIiLEAST16 "i" -#define PRIiLEAST32 "i" -#define PRIiLEAST64 "li" +# define PRIiLEAST8 "i" +# define PRIiLEAST16 "i" +# define PRIiLEAST32 "i" +# define PRIiLEAST64 "li" -#define PRIiFAST8 "i" -#define PRIiFAST16 "i" -#define PRIiFAST32 "i" -#define PRIiFAST64 "li" +# define PRIiFAST8 "i" +# define PRIiFAST16 "i" +# define PRIiFAST32 "i" +# define PRIiFAST64 "li" /* Octal notation. */ -#define PRIo8 "o" -#define PRIo16 "o" -#define PRIo32 "o" -#define PRIo64 "lo" +# define PRIo8 "o" +# define PRIo16 "o" +# define PRIo32 "o" +# define PRIo64 "lo" -#define PRIoLEAST8 "o" -#define PRIoLEAST16 "o" -#define PRIoLEAST32 "o" -#define PRIoLEAST64 "lo" +# define PRIoLEAST8 "o" +# define PRIoLEAST16 "o" +# define PRIoLEAST32 "o" +# define PRIoLEAST64 "lo" -#define PRIoFAST8 "o" -#define PRIoFAST16 "o" -#define PRIoFAST32 "o" -#define PRIoFAST64 "lo" +# define PRIoFAST8 "o" +# define PRIoFAST16 "o" +# define PRIoFAST32 "o" +# define PRIoFAST64 "lo" /* lowercase hexadecimal notation. */ -#define PRIx8 "x" -#define PRIx16 "x" -#define PRIx32 "x" -#define PRIx64 "lx" +# define PRIx8 "x" +# define PRIx16 "x" +# define PRIx32 "x" +# define PRIx64 "lx" -#define PRIxLEAST8 "x" -#define PRIxLEAST16 "x" -#define PRIxLEAST32 "x" -#define PRIxLEAST64 "lx" +# define PRIxLEAST8 "x" +# define PRIxLEAST16 "x" +# define PRIxLEAST32 "x" +# define PRIxLEAST64 "lx" -#define PRIxFAST8 "x" -#define PRIxFAST16 "x" -#define PRIxFAST32 "x" -#define PRIxFAST64 "lx" +# define PRIxFAST8 "x" +# define PRIxFAST16 "x" +# define PRIxFAST32 "x" +# define PRIxFAST64 "lx" /* UPPERCASE hexadecimal notation. */ -#define PRIX8 "X" -#define PRIX16 "X" -#define PRIX32 "X" -#define PRIX64 "lX" +# define PRIX8 "X" +# define PRIX16 "X" +# define PRIX32 "X" +# define PRIX64 "lX" -#define PRIXLEAST8 "X" -#define PRIXLEAST16 "X" -#define PRIXLEAST32 "X" -#define PRIXLEAST64 "lX" +# define PRIXLEAST8 "X" +# define PRIXLEAST16 "X" +# define PRIXLEAST32 "X" +# define PRIXLEAST64 "lX" -#define PRIXFAST8 "X" -#define PRIXFAST16 "X" -#define PRIXFAST32 "X" -#define PRIXFAST64 "lX" +# define PRIXFAST8 "X" +# define PRIXFAST16 "X" +# define PRIXFAST32 "X" +# define PRIXFAST64 "lX" /* Unsigned integers. */ -#define PRIu8 "u" -#define PRIu16 "u" -#define PRIu32 "u" -#define PRIu64 "lu" +# 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 PRIuLEAST8 "u" +# define PRIuLEAST16 "u" +# define PRIuLEAST32 "u" +# define PRIuLEAST64 "lu" -#define PRIuFAST8 "u" -#define PRIuFAST16 "u" -#define PRIuFAST32 "u" -#define PRIuFAST64 "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 PRIoMAX "lo" -#define PRIxMAX "lx" -#define PRIuMAX "lu" - - -/* Macros for printing `intfast_t' and `uintfast_t'. */ -#define PRIdFAST "ld" -#define PRIoFAST "lo" -#define PRIxFAST "lx" -#define PRIuFAST "lu" +# define PRIdMAX "ld" +# define PRIoMAX "lo" +# define PRIxMAX "lx" +# define PRIuMAX "lu" /* Macros for printing `intptr_t' and `uintptr_t'. */ -#define PRIdPTR "ld" -#define PRIoPTR "lo" -#define PRIxPTR "lx" -#define PRIuPTR "lu" +# define PRIdPTR "ld" +# define PRIoPTR "lo" +# define PRIxPTR "lx" +# define PRIuPTR "lu" /* Macros for printing format specifiers. */ /* Decimal notation. */ -#define SCNd8 "hhd" -#define SCNd16 "hd" -#define SCNd32 "d" -#define SCNd64 "ld" +# define SCNd8 "hhd" +# define SCNd16 "hd" +# define SCNd32 "d" +# define SCNd64 "ld" -#define SCNi8 "hhi" -#define SCNi16 "hi" -#define SCNi32 "i" -#define SCNi64 "li" +# 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 SCNu8 "hhu" +# define SCNu16 "hu" +# define SCNu32 "u" +# define SCNu64 "lu" /* Octal notation. */ -#define SCNo8 "hho" -#define SCNo16 "ho" -#define SCNo32 "o" -#define SCNo64 "lo" +# define SCNo8 "hho" +# define SCNo16 "ho" +# define SCNo32 "o" +# define SCNo64 "lo" /* Hexadecimal notation. */ -#define SCNx8 "hhx" -#define SCNx16 "hx" -#define SCNx32 "x" -#define SCNx64 "lx" +# define SCNx8 "hhx" +# define SCNx16 "hx" +# define SCNx32 "x" +# define SCNx64 "lx" /* Macros for scaning `intfast_t' and `uintfast_t'. */ -#define SCNdFAST "ld" -#define SCNiFAST "li" -#define SCNoFAST "lo" -#define SCNxFAST "lx" +# define SCNdFAST "ld" +# define SCNiFAST "li" +# define SCNoFAST "lo" +# define SCNxFAST "lx" /* Macros for scaning `intptr_t' and `uintptr_t'. */ -#define SCNdPTR "ld" -#define SCNiPTR "li" -#define SCNoPTR "lo" -#define SCNxPTR "lx" - - -/* Limits of other integer types. */ +# define SCNdPTR "ld" +# define SCNiPTR "li" +# define SCNoPTR "lo" +# define SCNxPTR "lx" -/* Limits of `ptrdiff_t' type. */ -#define PTRDIFF_MIN (-9223372036854775807L-1) -#define PTRDIFF_MAX (9223372036854775807L) +#endif /* C++ && format macros */ -/* Limits of `sig_atomic_t'. */ -#define SIG_ATOMIC_MIN (-2147483647-1) -#define SIG_ATOMIC_MAX (2147483647) -/* Limit of `size_t' type. */ -#define SIZE_MAX (18446744073709551615uL) - -/* Limits of `wchar_t'. */ -#ifndef WCHAR_MIN -/* These constants might also be defined in . */ -# define WCHAR_MIN (-2147483647-1) -# define WCHAR_MAX (2147483647) -#endif - -/* Limits of `wint_t'. */ -#define WINT_MIN (0) -#define WINT_MAX (4294967295U) - - -/* Macros for string conversion. */ +__BEGIN_DECLS /* Like `strtol' but convert to `intmax_t'. */ extern intmax_t strtoimax __P ((__const char *__restrict __nptr, @@ -458,4 +271,6 @@ wcstoumax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr, } #endif /* GCC and Optimization. */ +__END_DECLS + #endif /* inttypes.h */ diff --git a/sysdeps/wordsize-64/stdint.h b/sysdeps/wordsize-64/stdint.h new file mode 100644 index 0000000000..3e05aebe54 --- /dev/null +++ b/sysdeps/wordsize-64/stdint.h @@ -0,0 +1,214 @@ +/* Copyright (C) 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* + * ISO C 9X: 7.4 Integer types + */ + +#ifndef _STDINT_H +#define _STDINT_H 1 + +#include +#define __need_wchar_t +#include + +/* Exact integral types. */ + +/* Signed. */ + +/* There is some amount of overlap with as known by inet code */ +#ifndef __int8_t_defined +# define __int8_t_defined +typedef signed char int8_t; +typedef short int int16_t; +typedef int int32_t; +typedef long int int64_t; +#endif + +/* Unsigned. */ +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long int uint64_t; + + +/* Small types. */ + +/* Signed. */ +typedef signed char int_least8_t; +typedef short int int_least16_t; +typedef int int_least32_t; +typedef long int int_least64_t; + +/* Unsigned. */ +typedef unsigned char uint_least8_t; +typedef unsigned short int uint_least16_t; +typedef unsigned int uint_least32_t; +typedef unsigned long int uint_least64_t; + + +/* Fast types. */ + +/* Signed. */ +typedef signed char int_fast8_t; +typedef long int int_fast16_t; +typedef long int int_fast32_t; +typedef long int int_fast64_t; + +/* Unsigned. */ +typedef unsigned char uint_fast8_t; +typedef unsigned long int uint_fast16_t; +typedef unsigned long int uint_fast32_t; +typedef unsigned long int uint_fast64_t; + + +/* Types for `void *' pointers. */ +typedef int intptr_t; +typedef unsigned long int uintptr_t; + + +/* Largest integral types. */ +typedef long int intmax_t; +typedef unsigned long int uintmax_t; + + +/* The ISO C 9X standard specifies that these macros must only be + defined if explicitly requested. */ +#if !defined __cplusplus || defined __STDC_LIMIT_MACROS + +/* Limits of integral types. */ + +/* Minimum of signed integral types. */ +# define INT8_MIN (-128) +# define INT16_MIN (-32767-1) +# define INT32_MIN (-2147483647-1) +# define INT64_MIN (-9223372036854775807LL-1) +/* Maximum of signed integral types. */ +# define INT8_MAX (127) +# define INT16_MAX (32767) +# define INT32_MAX (2147483647) +# define INT64_MAX (9223372036854775807LL) + +/* Maximum of unsigned integral types. */ +# define UINT8_MAX (255U) +# define UINT16_MAX (65535U) +# define UINT32_MAX (4294967295U) +# define UINT64_MAX (18446744073709551615uLL) + + +/* Minimum of signed integral types having a minimum size. */ +# define INT_LEAST8_MIN (-128) +# define INT_LEAST16_MIN (-32767-1) +# define INT_LEAST32_MIN (-2147483647-1) +# define INT_LEAST64_MIN (-9223372036854775807LL-1) +/* Maximum of signed integral types having a minimum size. */ +# define INT_LEAST8_MAX (127) +# define INT_LEAST16_MAX (32767) +# define INT_LEAST32_MAX (2147483647) +# define INT_LEAST64_MAX (9223372036854775807LL) + +/* Maximum of unsigned integral types having a minimum size. */ +# define UINT_LEAST8_MAX (255U) +# define UINT_LEAST16_MAX (65535U) +# define UINT_LEAST32_MAX (4294967295U) +# define UINT_LEAST64_MAX (18446744073709551615uLL) + + +/* Minimum of fast signed integral types having a minimum size. */ +# define INT_FAST8_MIN (-128) +# define INT_FAST16_MIN (-9223372036854775807LL-1) +# define INT_FAST32_MIN (-9223372036854775807LL-1) +# define INT_FAST64_MIN (-9223372036854775807LL-1) +/* Maximum of fast signed integral types having a minimum size. */ +# define INT_FAST8_MAX (127) +# define INT_FAST16_MAX (9223372036854775807LL) +# define INT_FAST32_MAX (9223372036854775807LL) +# define INT_FAST64_MAX (9223372036854775807LL) + +/* Maximum of fast unsigned integral types having a minimum size. */ +# define UINT_FAST8_MAX (255U) +# define UINT_FAST16_MAX (18446744073709551615uLL) +# define UINT_FAST32_MAX (18446744073709551615uLL) +# define UINT_FAST64_MAX (18446744073709551615uLL) + + +/* Values to test for integral types holding `void *' pointer. */ +# define INTPTR_MIN (-9223372036854775807L-1) +# define INTPTR_MAX (9223372036854775807L +# define UINTPTR_MAX (18446744073709551615uL) + + +/* Minimum for largest signed integral type. */ +# define INTMAX_MIN (-9223372036854775807LL-1) +/* Maximum for largest signed integral type. */ +# define INTMAX_MAX (9223372036854775807LL) + +/* Maximum for largest unsigned integral type. */ +# define UINTMAX_MAX (18446744073709551615uLL) + + +/* Limits of other integer types. */ + +/* Limits of `ptrdiff_t' type. */ +# define PTRDIFF_MIN (-9223372036854775807L-1) +# define PTRDIFF_MAX (9223372036854775807L) + +/* Limits of `sig_atomic_t'. */ +# define SIG_ATOMIC_MIN (-2147483647-1) +# define SIG_ATOMIC_MAX (2147483647) + +/* Limit of `size_t' type. */ +# define SIZE_MAX (18446744073709551615uL) + +/* Limits of `wchar_t'. */ +# ifndef WCHAR_MIN +/* These constants might also be defined in . */ +# define WCHAR_MIN (-2147483647-1) +# define WCHAR_MAX (2147483647) +# endif + +/* Limits of `wint_t'. */ +# define WINT_MIN (0) +# define WINT_MAX (4294967295U) + +#endif /* C++ && limit macros */ + + +/* The ISO C 9X standard specifies that these macros must only be + defined if explicitly requested. */ +#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS + +/* Signed. */ +# define INT8_C(c) ((int8_t) c) +# define INT16_C(c) ((int16_t) c) +# define INT32_C(c) ((int32_t) c) +# define INT64_C(c) ((int64_t) __CONCAT (c,l)) + +/* Unsigned. */ +# define UINT8_C(c) ((uint8_t) __CONCAT (c,u)) +# define UINT16_C(c) ((uint16_t) __CONCAT (c,u)) +# define UINT32_C(c) ((uint32_t) __CONCAT (c,u)) +# define UINT64_C(c) ((uint64_t) __CONCAT (c,ul)) + +/* Maximal type. */ +# define INTMAX_C(c) ((intmax_t) __CONCAT (c,l)) +# define UINTMAX_C(c) ((uintmax_t) __CONCAT (c,ul)) + +#endif /* C++ && constant macros */ + +#endif /* stdint.h */ -- cgit 1.4.1