diff options
| author | Peter Galbavy <peter@cvs.openbsd.org> | 1998-07-21 13:54:06 +0000 |
|---|---|---|
| committer | Peter Galbavy <peter@cvs.openbsd.org> | 1998-07-21 13:54:06 +0000 |
| commit | 2979ca23937f55308c22a0cf2acb66a4525843c0 (patch) | |
| tree | 028173e908f14aa9b6c604cbab6f002858dbe4c4 /lib/libpthread/stdio/vfscanf.c | |
| parent | 0294ed9251849ce79ab3d4cc45841a9f6de82844 (diff) | |
fix up those 13 broken merges
Diffstat (limited to 'lib/libpthread/stdio/vfscanf.c')
| -rw-r--r-- | lib/libpthread/stdio/vfscanf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libpthread/stdio/vfscanf.c b/lib/libpthread/stdio/vfscanf.c index afdd7604360..723e37c5a7a 100644 --- a/lib/libpthread/stdio/vfscanf.c +++ b/lib/libpthread/stdio/vfscanf.c @@ -1,5 +1,6 @@ /*- * Copyright (c) 1990 The Regents of the University of California. + * Copyright (c) 1993, 1994 Chris Provenzano. * All rights reserved. * * This code is derived from software contributed to Berkeley by @@ -36,7 +37,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)vfscanf.c 5.7 (Berkeley) 12/14/92";*/ -static char *rcsid = "$Id: vfscanf.c,v 1.2 1997/07/25 20:30:25 mickey Exp $"; +static char *rcsid = "$Id: vfscanf.c,v 1.3 1998/07/21 13:54:05 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> @@ -98,7 +99,7 @@ static u_char *__sccl(); __svfscanf(fp, fmt0, ap) register FILE *fp; char const *fmt0; - va_list ap; + pthread_va_list ap; { register u_char *fmt = (u_char *)fmt0; register int c; /* character from format, or conversion */ |