diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-11-12 07:04:35 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-11-12 07:04:35 +0000 |
| commit | 1b5098ce5af0beb7c1b212d5ecfa928e80a50885 (patch) | |
| tree | 52435f265db88926013b7585b1ca5188a395c2e9 | |
| parent | both files contain a function which should only be static. (diff) | |
| download | wireguard-openbsd-1b5098ce5af0beb7c1b212d5ecfa928e80a50885.tar.xz wireguard-openbsd-1b5098ce5af0beb7c1b212d5ecfa928e80a50885.zip | |
a __fputwc_unlock() prototype was available in fvwrite.h, so use that
| -rw-r--r-- | lib/libc/stdio/flags.c | 3 | ||||
| -rw-r--r-- | lib/libc/stdio/fputws.c | 5 | ||||
| -rw-r--r-- | lib/libc/stdio/fvwrite.h | 3 | ||||
| -rw-r--r-- | lib/libc/stdio/vfwprintf.c | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c index 36f8410a293..8cd1ce279d0 100644 --- a/lib/libc/stdio/flags.c +++ b/lib/libc/stdio/flags.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flags.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */ +/* $OpenBSD: flags.c,v 1.7 2013/11/12 07:04:35 deraadt Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -35,6 +35,7 @@ #include <sys/file.h> #include <stdio.h> #include <errno.h> +#include "local.h" /* * Return the (stdio) flags for a given mode. Store the flags diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c index c4c2d8ea068..108846e7099 100644 --- a/lib/libc/stdio/fputws.c +++ b/lib/libc/stdio/fputws.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fputws.c,v 1.6 2013/04/17 17:40:35 tedu Exp $ */ +/* $OpenBSD: fputws.c,v 1.7 2013/11/12 07:04:35 deraadt Exp $ */ /* $NetBSD: fputws.c,v 1.1 2003/03/07 07:11:37 tshiozak Exp $ */ /*- @@ -34,8 +34,7 @@ #include <stdio.h> #include <wchar.h> #include "local.h" - -wint_t __fputwc_unlock(wchar_t wc, FILE *fp); +#include "fvwrite.h" int fputws(ws, fp) diff --git a/lib/libc/stdio/fvwrite.h b/lib/libc/stdio/fvwrite.h index 2344e42e2f6..d3a309b2938 100644 --- a/lib/libc/stdio/fvwrite.h +++ b/lib/libc/stdio/fvwrite.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fvwrite.h,v 1.5 2003/06/02 20:18:37 millert Exp $ */ +/* $OpenBSD: fvwrite.h,v 1.6 2013/11/12 07:04:35 deraadt Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,3 +46,4 @@ struct __suio { }; extern int __sfvwrite(FILE *, struct __suio *); +wint_t __fputwc_unlock(wchar_t wc, FILE *fp); diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c index 413df38550e..53c0aaf7362 100644 --- a/lib/libc/stdio/vfwprintf.c +++ b/lib/libc/stdio/vfwprintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfwprintf.c,v 1.7 2013/11/01 19:05:11 guenther Exp $ */ +/* $OpenBSD: vfwprintf.c,v 1.8 2013/11/12 07:04:35 deraadt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -54,8 +54,6 @@ #include "local.h" #include "fvwrite.h" -wint_t __fputwc_unlock(wchar_t wc, FILE *fp); - union arg { int intarg; unsigned int uintarg; |