diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-06-15 10:07:36 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-06-15 10:09:30 +0200 |
| commit | 7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88 (patch) | |
| tree | abe81dc7c6f5cb9b3ed94c84159d180c1bcb5431 /libio | |
| parent | 16552c01a66633c9e412984d9d92616bd4e5303c (diff) | |
| parent | 765ade4b29d9fcc4b236b4f3ae5bfd1174978442 (diff) | |
| download | glibc-7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88.tar glibc-7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88.tar.gz glibc-7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88.tar.bz2 glibc-7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88.zip | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/stdio.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libio/stdio.h b/libio/stdio.h index 6ca4771830..f9ffdb2fc5 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -449,9 +449,9 @@ extern int __REDIRECT (fscanf, (FILE *__restrict __stream, __isoc99_fscanf) __wur; extern int __REDIRECT (scanf, (__const char *__restrict __format, ...), __isoc99_scanf) __wur; -extern int __REDIRECT (sscanf, (__const char *__restrict __s, - __const char *__restrict __format, ...), - __isoc99_sscanf) __THROW; +extern int __REDIRECT_NTH (sscanf, (__const char *__restrict __s, + __const char *__restrict __format, ...), + __isoc99_sscanf); # else extern int __isoc99_fscanf (FILE *__restrict __stream, __const char *__restrict __format, ...) __wur; @@ -503,11 +503,11 @@ extern int __REDIRECT (vfscanf, extern int __REDIRECT (vscanf, (__const char *__restrict __format, _G_va_list __arg), __isoc99_vscanf) __attribute__ ((__format__ (__scanf__, 1, 0))) __wur; -extern int __REDIRECT (vsscanf, - (__const char *__restrict __s, - __const char *__restrict __format, _G_va_list __arg), - __isoc99_vsscanf) - __THROW __attribute__ ((__format__ (__scanf__, 2, 0))); +extern int __REDIRECT_NTH (vsscanf, + (__const char *__restrict __s, + __const char *__restrict __format, + _G_va_list __arg), __isoc99_vsscanf) + __attribute__ ((__format__ (__scanf__, 2, 0))); # else extern int __isoc99_vfscanf (FILE *__restrict __s, __const char *__restrict __format, |