===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.794
retrieving revision 1.795
diff -u -r1.794 -r1.795
--- src/usr.bin/tmux/tmux.h	2017/07/12 09:21:25	1.794
+++ src/usr.bin/tmux/tmux.h	2017/07/12 09:24:17	1.795
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.794 2017/07/12 09:21:25 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.795 2017/07/12 09:24:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1485,6 +1485,7 @@
 extern struct environ	*global_environ;
 extern struct timeval	 start_time;
 extern const char	*socket_path;
+extern const char	*shell_command;
 extern int		 ptm_fd;
 extern const char	*shell_command;
 int		 areshell(const char *);
@@ -1494,10 +1495,11 @@
 /* proc.c */
 struct imsg;
 int	proc_send(struct tmuxpeer *, enum msgtype, int, const void *, size_t);
-struct tmuxproc *proc_start(const char *, struct event_base *, int,
-	    void (*)(int));
+struct tmuxproc *proc_start(const char *);
 void	proc_loop(struct tmuxproc *, int (*)(void));
 void	proc_exit(struct tmuxproc *);
+void	proc_set_signals(struct tmuxproc *, void(*)(int));
+void	proc_clear_signals(struct tmuxproc *);
 struct tmuxpeer *proc_add_peer(struct tmuxproc *, int,
 	    void (*)(struct imsg *, void *), void *);
 void	proc_remove_peer(struct tmuxpeer *);
@@ -1857,7 +1859,7 @@
 int	 server_is_marked(struct session *, struct winlink *,
 	     struct window_pane *);
 int	 server_check_marked(void);
-int	 server_start(struct event_base *, int, char *);
+int	 server_start(struct tmuxproc *, struct event_base *, int, char *);
 void	 server_update_socket(void);
 void	 server_add_accept(int);
 
@@ -2256,10 +2258,6 @@
 void	 check_window_name(struct window *);
 char	*default_window_name(struct window *);
 char	*parse_window_name(const char *);
-
-/* signal.c */
-void	set_signals(void(*)(int, short, void *), void *);
-void	clear_signals(int);
 
 /* control.c */
 void	control_callback(struct client *, int, void *);