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/scanf.c | |
| parent | 439ff07be06e9354151f984c7d0d2fb05917e8be (diff) | |
| download | glibc-14c3586351fdf3e123b000f95a1e83314f78babb.tar.gz glibc-14c3586351fdf3e123b000f95a1e83314f78babb.tar.xz 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/scanf.c')
| -rw-r--r-- | stdio-common/scanf.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/stdio-common/scanf.c b/stdio-common/scanf.c index 268aa905f8..62c9959651 100644 --- a/stdio-common/scanf.c +++ b/stdio-common/scanf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2002, 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 @@ -19,9 +20,7 @@ #include <stdarg.h> #include <stdio.h> -#ifdef USE_IN_LIBIO -# include <libioP.h> -#endif +#include <libioP.h> /* Read formatted input from stdin according to the format string FORMAT. */ @@ -33,11 +32,7 @@ scanf (const char *format, ...) int done; va_start (arg, format); -#ifdef USE_IN_LIBIO done = INTUSE(_IO_vfscanf) (stdin, format, arg, NULL); -#else - done = vfscanf (stdin, format, arg); -#endif va_end (arg); return done; |