diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2005-05-11 18:39:20 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2005-05-11 18:39:20 +0000 |
| commit | 8d8d7a1eeeb3509c69bb27b3d97c04a887175599 (patch) | |
| tree | 3a82f7647a16b601fe6f2e67afec249e4087456d /include/stdio.h | |
| parent | 63cdea24dc015481c84d87a03b0a235ba64d1cdb (diff) | |
let vfscanf be a real function. Use a weak_alias on systems where this
is feasible.
Okay millert@
There's a major libc bump coming that is going to cover this as well...
Diffstat (limited to 'include/stdio.h')
| -rw-r--r-- | include/stdio.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/stdio.h b/include/stdio.h index 197d972dac0..8329e00d298 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdio.h,v 1.31 2005/04/30 09:25:17 espie Exp $ */ +/* $OpenBSD: stdio.h,v 1.32 2005/05/11 18:39:19 espie Exp $ */ /* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */ /*- @@ -327,16 +327,12 @@ int vscanf(const char *, _BSD_VA_LIST_) int vsscanf(const char *, const char *, _BSD_VA_LIST_) __attribute__((__format__ (scanf, 2, 0))) __attribute__((__nonnull__ (2))); +int vfscanf(FILE *, const char *, _BSD_VA_LIST_) + __attribute__((__format__ (scanf, 2, 0))) + __attribute__((__nonnull__ (2))); __END_DECLS /* - * This is a #define because the function is used internally and - * (unlike vfscanf) the name __svfscanf is guaranteed not to collide - * with a user function when _ANSI_SOURCE or _POSIX_SOURCE is defined. - */ -#define vfscanf __svfscanf - -/* * Stdio function-access interface. */ __BEGIN_DECLS @@ -355,7 +351,6 @@ __END_DECLS */ __BEGIN_DECLS int __srget(FILE *); -int __svfscanf(FILE *, const char *, _BSD_VA_LIST_); int __swbuf(int, FILE *); __END_DECLS |