Merge branch 'obsd-master'

Conflicts:
	format.c
	osdep-openbsd.c

1 files changed, 9 insertions, 9 deletions

diff --git a/cfg.c b/cfg.c
index 32a92e1b..463c42a2 100644
--- a/cfg.c
+++ b/cfg.c
@@ -27,15 +27,15 @@
 
 #include "tmux.h"
 
-char		 *cfg_file;
-struct cmd_q	 *cfg_cmd_q;
-int		  cfg_finished;
-int		  cfg_references;
-char		**cfg_causes;
-u_int		  cfg_ncauses;
-struct client	 *cfg_client;
+char			 *cfg_file;
+static struct cmd_q	 *cfg_cmd_q;
+int			  cfg_finished;
+int			  cfg_references;
+static char		**cfg_causes;
+static u_int		  cfg_ncauses;
+struct client		 *cfg_client;
 
-void	cfg_default_done(struct cmd_q *);
+static void	  cfg_default_done(struct cmd_q *);
 
 void
 set_cfg_file(const char *path)
@@ -125,7 +125,7 @@ load_cfg(const char *path, struct cmd_q *cmdq, int quiet)
 	return (found);
 }
 
-void
+static void
 cfg_default_done(__unused struct cmd_q *cmdq)
 {
 	if (--cfg_references != 0)