Merge branch 'obsd-master'

Conflicts:
	format.c
	osdep-openbsd.c

1 files changed, 8 insertions, 5 deletions

diff --git a/tmux.c b/tmux.c
index 1b3332a7..f77c981c 100644
--- a/tmux.c
+++ b/tmux.c
@@ -43,10 +43,13 @@ struct hooks	*global_hooks;
 struct timeval	 start_time;
 const char	*socket_path;
 
-__dead void	 usage(void);
-static char	*make_label(const char *);
+static __dead void	 usage(void);
+static char		*make_label(const char *);
 
-__dead void
+static const char	*getshell(void);
+static int		 checkshell(const char *);
+
+static __dead void
 usage(void)
 {
 	fprintf(stderr,
@@ -56,7 +59,7 @@ usage(void)
 	exit(1);
 }
 
-const char *
+static const char *
 getshell(void)
 {
 	struct passwd	*pw;
@@ -73,7 +76,7 @@ getshell(void)
 	return (_PATH_BSHELL);
 }
 
-int
+static int
 checkshell(const char *shell)
 {
 	if (shell == NULL || *shell == '\0' || *shell != '/')