summaryrefslogtreecommitdiff
path: root/stdio-common/printf-prs.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-19 00:37:59 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-19 00:37:59 +0000
commit14c3586351fdf3e123b000f95a1e83314f78babb (patch)
treea88a6bfd8d809ab0b8e9ca70a2e63e932ddfa53d /stdio-common/printf-prs.c
parent439ff07be06e9354151f984c7d0d2fb05917e8be (diff)
downloadglibc-14c3586351fdf3e123b000f95a1e83314f78babb.tar.gz
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-prs.c')
-rw-r--r--stdio-common/printf-prs.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c
index 7aef42d819..f3b27d6712 100644
--- a/stdio-common/printf-prs.c
+++ b/stdio-common/printf-prs.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,92,95,96,99,2000,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995, 1996, 1999, 2000, 2002, 2003, 2004
+ 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
@@ -34,19 +35,10 @@
# define ISASCII(Ch) isascii (Ch)
# define MBRLEN(Cp, L, St) __mbrlen (Cp, L, St)
-# ifdef USE_IN_LIBIO
-# define PUT(F, S, N) _IO_sputn (F, S, N)
-# define PAD(Padchar) \
- if (width > 0) \
- done += INTUSE(_IO_padn) (s, Padchar, width)
-# else
-# define PUTC(C, F) putc (C, F)
-ssize_t __printf_pad __P ((FILE *, char pad, size_t n));
+# define PUT(F, S, N) _IO_sputn (F, S, N)
# define PAD(Padchar) \
if (width > 0) \
- { if (__printf_pad (s, Padchar, width) == -1) \
- return -1; else done += width; }
-# endif
+ done += INTUSE(_IO_padn) (s, Padchar, width)
#else
# define vfprintf vfwprintf
# define CHAR_T wchar_t
@@ -55,19 +47,10 @@ ssize_t __printf_pad __P ((FILE *, char pad, size_t n));
# define L_(Str) L##Str
# define ISDIGIT(Ch) iswdigit (Ch)
-# ifdef USE_IN_LIBIO
# define PUT(F, S, N) _IO_sputn (F, S, N)
# define PAD(Padchar) \
if (width > 0) \
done += _IO_wpadn (s, Padchar, width)
-# else
-# define PUTC(C, F) wputc (C, F)
-ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n));
-# define PAD(Padchar) \
- if (width > 0) \
- { if (__wprintf_pad (s, Padchar, width) == -1) \
- return -1; else done += width; }
-# endif
#endif
#define DONT_NEED_READ_INT