diff options
Diffstat (limited to 'lib/libpthread')
| -rw-r--r-- | lib/libpthread/include/stdio.h | 4 | ||||
| -rw-r--r-- | lib/libpthread/stdio/fflush.c | 4 | ||||
| -rw-r--r-- | lib/libpthread/stdio/ftell.c | 4 | ||||
| -rw-r--r-- | lib/libpthread/stdio/vfprintf.c | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/lib/libpthread/include/stdio.h b/lib/libpthread/include/stdio.h index 70a4265ae2ab..7e58f48875b5 100644 --- a/lib/libpthread/include/stdio.h +++ b/lib/libpthread/include/stdio.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)stdio.h 5.17 (Berkeley) 6/3/91 - * $Id: stdio.h,v 1.1 1994/01/30 04:22:49 proven Exp $ + * $Id: stdio.h,v 1.2 1994/04/09 15:34:53 ats Exp $ */ #ifndef _STDIO_H_ @@ -296,6 +296,8 @@ __BEGIN_DECLS int __srget __P((FILE *)); int __svfscanf __P((FILE *, const char *, va_list)); int __swbuf __P((int, FILE *)); +void flockfile(FILE *); +void funlockfile(FILE *); __END_DECLS /* diff --git a/lib/libpthread/stdio/fflush.c b/lib/libpthread/stdio/fflush.c index b7f66c3b4a13..127040f0298e 100644 --- a/lib/libpthread/stdio/fflush.c +++ b/lib/libpthread/stdio/fflush.c @@ -36,7 +36,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)fflush.c 5.1 (Berkeley) 1/20/91";*/ -static char *rcsid = "$Id: fflush.c,v 1.1 1994/01/30 04:24:37 proven Exp $"; +static char *rcsid = "$Id: fflush.c,v 1.2 1994/04/09 15:37:44 ats Exp $"; #endif /* LIBC_SCCS and not lint */ #include <pthread.h> @@ -51,7 +51,7 @@ fflush(fp) int retval; if (fp == NULL) - return (__swalk_sflush); + return (__swalk_sflush()); flockfile(fp); if ((fp->_flags & (__SWR | __SRW)) == 0) { diff --git a/lib/libpthread/stdio/ftell.c b/lib/libpthread/stdio/ftell.c index d19e5825ad50..bf0eb4aa1769 100644 --- a/lib/libpthread/stdio/ftell.c +++ b/lib/libpthread/stdio/ftell.c @@ -36,7 +36,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)ftell.c 5.4 (Berkeley) 2/5/91";*/ -static char *rcsid = "$Id: ftell.c,v 1.1 1994/01/30 04:25:01 proven Exp $"; +static char *rcsid = "$Id: ftell.c,v 1.2 1994/06/06 08:35:25 ats Exp $"; #endif /* LIBC_SCCS and not lint */ #include <pthread.h> @@ -62,7 +62,7 @@ ftell(fp) if (fp->_flags & __SOFF) pos = fp->_offset; else { - pos = lseek(fp, (fpos_t)0, SEEK_CUR); + pos = lseek(fp->_file, (fpos_t)0, SEEK_CUR); } if (pos != -1L) { diff --git a/lib/libpthread/stdio/vfprintf.c b/lib/libpthread/stdio/vfprintf.c index 8b3d29e74e30..70bab40d6518 100644 --- a/lib/libpthread/stdio/vfprintf.c +++ b/lib/libpthread/stdio/vfprintf.c @@ -36,7 +36,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)vfprintf.c 5.50 (Berkeley) 12/16/92";*/ -static char *rcsid = "$Id: vfprintf.c,v 1.1 1994/01/30 04:25:51 proven Exp $"; +static char *rcsid = "$Id: vfprintf.c,v 1.2 1994/05/27 07:41:16 pst Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -473,7 +473,11 @@ reswitch: switch (ch) { * -- ANSI X3J11 */ /* NOSTRICT */ +#ifdef __i386 + _uquad = (u_quad_t)(u_long)va_arg(ap, void *); +#else _uquad = (u_quad_t)va_arg(ap, void *); +#endif base = HEX; xdigs = "0123456789abcdef"; flags |= HEXPREFIX; |