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/sscanf.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/sscanf.c')
| -rw-r--r-- | stdio-common/sscanf.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/stdio-common/sscanf.c b/stdio-common/sscanf.c index ed4cb1d3a1..b36976710b 100644 --- a/stdio-common/sscanf.c +++ b/stdio-common/sscanf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,1995,1996,1998,2002,2003 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1998, 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 @@ -18,11 +19,8 @@ #include <stdarg.h> #include <stdio.h> - -#ifdef USE_IN_LIBIO -# include <libio/iolibio.h> -# define __vsscanf(s, f, a) _IO_vsscanf (s, f, a) -#endif +#include <libio/iolibio.h> +#define __vsscanf(s, f, a) _IO_vsscanf (s, f, a) /* Read formatted input from S, according to the format string FORMAT. */ /* VARARGS2 */ @@ -40,8 +38,6 @@ sscanf (const char *s, const char *format, ...) } libc_hidden_def (sscanf) -#ifdef USE_IN_LIBIO -# undef _IO_sscanf +#undef _IO_sscanf /* This is for libg++. */ strong_alias (sscanf, _IO_sscanf) -#endif |