diff options
| author |   mortimer <mortimer@openbsd.org> | 2021-01-18 00:51:15 +0000 |
|---|---|---|
| committer | mortimer <mortimer@openbsd.org> | 2021-01-18 00:51:15 +0000 |
| commit | 2c2b851578fc68210645659ef1bb40fb03f11d6b (patch) | |
| tree | 5cb514709e7f868b8ad5309218d4f9c13c82ab26 | |
| parent | Move defiition of sum variable from header file to avoid issues with (diff) | |
| download | wireguard-openbsd-2c2b851578fc68210645659ef1bb40fb03f11d6b.tar.xz wireguard-openbsd-2c2b851578fc68210645659ef1bb40fb03f11d6b.zip | |
Move usage definition out of header file to avoid issues with -fno-common.
ok deraadt@
| -rw-r--r-- | usr.bin/rcs/rcsprog.c | 3 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsprog.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c index 686275bc6d8..7927d3a7768 100644 --- a/usr.bin/rcs/rcsprog.c +++ b/usr.bin/rcs/rcsprog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.162 2020/06/09 20:05:40 joris Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.163 2021/01/18 00:51:15 mortimer Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -60,6 +60,7 @@ struct rcs_prog { { "ident", ident_main, ident_usage }, { "merge", merge_main, merge_usage }, }; +void (*usage)(void); struct wklhead temp_files; diff --git a/usr.bin/rcs/rcsprog.h b/usr.bin/rcs/rcsprog.h index 9cb44c5ab5b..b42e64d5173 100644 --- a/usr.bin/rcs/rcsprog.h +++ b/usr.bin/rcs/rcsprog.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.h,v 1.64 2014/10/02 06:23:15 otto Exp $ */ +/* $OpenBSD: rcsprog.h,v 1.65 2021/01/18 00:51:15 mortimer Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -120,7 +120,7 @@ int build_cmd(char ***, char **, int); int rcs_getopt(int, char **, const char *); int rcs_main(int, char **); __dead void rcs_usage(void); -void (*usage)(void); +extern void (*usage)(void); /* rlog.c */ int rlog_main(int, char **); |