Merge branch 'obsd-master'

Conflicts:
	Makefile
	format.c

1 files changed, 2 insertions, 2 deletions

diff --git a/tmux.c b/tmux.c
index 61c95af8..21dc15e1 100644
--- a/tmux.c
+++ b/tmux.c
@@ -200,7 +200,7 @@ shell_exec(const char *shell, const char *shellcmd)
 	fatal("execl failed");
 }
 
-const char*
+const char *
 find_home(void)
 {
 	struct passwd	*pw;
@@ -215,7 +215,7 @@ find_home(void)
 			home = NULL;
 	}
 
-	return home;
+	return (home);
 }
 
 int