Merge branch 'obsd-master'

Conflicts:
	Makefile.am
	pty.c

1 files changed, 0 insertions, 4 deletions

diff --git a/tmux.h b/tmux.h
index 4b3385c6..a152503b 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2313,8 +2313,4 @@ void		 style_apply_update(struct grid_cell *, struct options *,
 int		 style_equal(const struct grid_cell *,
 		     const struct grid_cell *);
 
-/* pty.c */
-int		 pty_open(int *);
-pid_t		 pty_fork(int, int *, char *, size_t, struct winsize *);
-
 #endif /* TMUX_H */