*** ./Makefile.in.ORIG	Mon Oct 15 09:41:37 2012
--- ./Makefile.in	Mon Oct 15 09:41:47 2012
***************
*** 193,199 ****
  	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
  	$(am__objects_14) $(am__objects_15)
  tmux_OBJECTS = $(dist_tmux_OBJECTS) $(nodist_tmux_OBJECTS)
! tmux_LDADD = $(LDADD)
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/etc/depcomp
  am__depfiles_maybe = depfiles
--- 193,199 ----
  	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
  	$(am__objects_14) $(am__objects_15)
  tmux_OBJECTS = $(dist_tmux_OBJECTS) $(nodist_tmux_OBJECTS)
! tmux_LDADD = $(LDADD) -lbsd
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/etc/depcomp
  am__depfiles_maybe = depfiles
*** ./cmd-list-clients.c.ORIG	Mon Oct 15 09:28:38 2012
--- ./cmd-list-clients.c	Mon Oct 15 09:29:11 2012
***************
*** 28,34 ****
   * List all clients.
   */
  
! int	cmd_list_clients_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_list_clients_entry = {
  	"list-clients", "lsc",
--- 28,34 ----
   * List all clients.
   */
  
! enum cmd_retval cmd_list_clients_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_list_clients_entry = {
  	"list-clients", "lsc",
*** ./cmd-list-keys.c.ORIG	Mon Oct 15 09:29:25 2012
--- ./cmd-list-keys.c	Mon Oct 15 09:30:49 2012
***************
*** 97,103 ****
  	return (CMD_RETURN_NORMAL);
  }
  
! int
  cmd_list_keys_table(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args			*args = self->args;
--- 97,103 ----
  	return (CMD_RETURN_NORMAL);
  }
  
! enum cmd_retval
  cmd_list_keys_table(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args			*args = self->args;
*** ./cmd-new-window.c.ORIG	Mon Oct 15 09:31:03 2012
--- ./cmd-new-window.c	Mon Oct 15 09:31:19 2012
***************
*** 26,32 ****
   * Create a new window.
   */
  
! int	cmd_new_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_new_window_entry = {
  	"new-window", "neww",
--- 26,32 ----
   * Create a new window.
   */
  
! enum cmd_retval cmd_new_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_new_window_entry = {
  	"new-window", "neww",
*** ./cmd-swap-window.c.ORIG	Mon Oct 15 09:31:41 2012
--- ./cmd-swap-window.c	Mon Oct 15 09:32:05 2012
***************
*** 26,32 ****
   * Swap one window with another.
   */
  
! int	cmd_swap_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_swap_window_entry = {
  	"swap-window", "swapw",
--- 26,32 ----
   * Swap one window with another.
   */
  
! enum cmd_retval cmd_swap_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_swap_window_entry = {
  	"swap-window", "swapw",