Move usage definition out of header file to avoid issues with -fno-common.

ok deraadt@

diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c
index 686275b..7927d3a 100644 (file)
--- 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 9cb44c5..b42e64d 100644 (file)
--- 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 **);