===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.590
retrieving revision 1.591
diff -c -r1.590 -r1.591
*** src/usr.bin/tmux/tmux.h	2015/11/24 22:27:22	1.590
--- src/usr.bin/tmux/tmux.h	2015/11/24 23:22:51	1.591
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.590 2015/11/24 22:27:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.591 2015/11/24 23:22:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1431,1437 ****
  extern struct options *global_s_options;
  extern struct options *global_w_options;
  extern struct environ *global_environ;
- extern char		*shell_cmd;
  extern struct timeval	 start_time;
  extern const char	*socket_path;
  const char	*getshell(void);
--- 1431,1436 ----
***************
*** 1732,1738 ****
  void	cmd_wait_for_flush(void);
  
  /* client.c */
! int	client_main(struct event_base *, int, char **, int);
  
  /* key-bindings.c */
  RB_PROTOTYPE(key_bindings, key_binding, entry, key_bindings_cmp);
--- 1731,1737 ----
  void	cmd_wait_for_flush(void);
  
  /* client.c */
! int	client_main(struct event_base *, int, char **, int, const char *);
  
  /* key-bindings.c */
  RB_PROTOTYPE(key_bindings, key_binding, entry, key_bindings_cmp);