diff options
author | Jakub Jelinek <jakub@redhat.com> | 2010-06-14 08:18:26 -0700 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2010-06-14 17:27:22 +0200 |
commit | d9c46d474be68847629028312aeea646590564f4 (patch) | |
tree | 6cb0c3c62545ba0708b2e33c733260c4dc35f1ac /libio | |
parent | 6f8d0c6391d8d47d9d70bbdbeaa8813b657ae097 (diff) | |
download | glibc-d9c46d474be68847629028312aeea646590564f4.tar.gz |
Fix a couple of __REDIRECT () __THROW occurrences
This patch fixes some cases which fail to parse with C++.
(cherry picked from commit f32f28695d938597ad93177dc83225dcb3c69f74)
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 85542b1cfd..bf16b3fff7 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -447,9 +447,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; @@ -501,11 +501,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, |