diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-03-19 00:37:59 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-03-19 00:37:59 +0000 |
| commit | 14c3586351fdf3e123b000f95a1e83314f78babb (patch) | |
| tree | a88a6bfd8d809ab0b8e9ca70a2e63e932ddfa53d /stdio-common/printf_size.c | |
| parent | 439ff07be06e9354151f984c7d0d2fb05917e8be (diff) | |
| download | glibc-14c3586351fdf3e123b000f95a1e83314f78babb.tar glibc-14c3586351fdf3e123b000f95a1e83314f78babb.tar.gz glibc-14c3586351fdf3e123b000f95a1e83314f78babb.tar.bz2 glibc-14c3586351fdf3e123b000f95a1e83314f78babb.zip | |
Update.
2004-03-18 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Remove hwcap
variable and weak_extern for _dl_hwcap.
(_DL_HWCAP_TLS_MASK): Define.
(HWCAP_CHECK): Fix checking of non-platform hwcap bits. Use
lib->osversion instead of cache_new->libs[middle].osversion.
* stdio-common/asprintf.c: Remove USE_IN_LIBIO conditionals.
* stdio-common/dprintf.c: Likewise.
* stdio-common/fprintf.c: Likewise.
* stdio-common/getline.c: Likewise.
* stdio-common/getw.c: Likewise.
* stdio-common/perror.c: Likewise.
* stdio-common/printf-prs.c: Likewise.
* stdio-common/printf.c: Likewise.
* stdio-common/printf_size.c: Likewise.
* stdio-common/psignal.c: Likewise.
* stdio-common/putw.c: Likewise.
* stdio-common/scanf.c: Likewise.
* stdio-common/snprintf.c: Likewise.
* stdio-common/sprintf.c: Likewise.
* stdio-common/sscanf.c: Likewise.
* stdio-common/tstgetln.c: Likewise.
* stdio-common/vfprintf.c: Likewise.
2004-03-18 Paul Eggert <eggert@cs.ucla.edu>
* posix/getopt.h (__GNUC_PREREQ) [!defined __THROW]: Define
if not defined, fixing a typo (it used to be defined if
__GNUC__ was not defined).
Diffstat (limited to 'stdio-common/printf_size.c')
| -rw-r--r-- | stdio-common/printf_size.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/stdio-common/printf_size.c b/stdio-common/printf_size.c index d4cbdbf772..3c7ac354e7 100644 --- a/stdio-common/printf_size.c +++ b/stdio-common/printf_size.c @@ -23,30 +23,20 @@ #include <ieee754.h> #include <math.h> #include <printf.h> -#ifdef USE_IN_LIBIO -# include <libioP.h> -#else -# include <stdio.h> -#endif +#include <libioP.h> /* This defines make it possible to use the same code for GNU C library and the GNU I/O library. */ -#ifdef USE_IN_LIBIO -# define PUT(f, s, n) _IO_sputn (f, s, n) -# define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n)) +#define PUT(f, s, n) _IO_sputn (f, s, n) +#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n)) /* We use this file GNU C library and GNU I/O library. So make names equal. */ -# undef putc -# define putc(c, f) (wide \ - ? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f)) -# define size_t _IO_size_t -# define FILE _IO_FILE -#else /* ! USE_IN_LIBIO */ -# define PUT(f, s, n) fwrite (s, 1, n, f) -# define PAD(f, c, n) __printf_pad (f, c, n) -ssize_t __printf_pad __P ((FILE *, char pad, int n)); /* In vfprintf.c. */ -#endif /* USE_IN_LIBIO */ +#undef putc +#define putc(c, f) (wide \ + ? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f)) +#define size_t _IO_size_t +#define FILE _IO_FILE /* Macros for doing the actual output. */ |