===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.810
retrieving revision 1.811
diff -c -r1.810 -r1.811
*** src/usr.bin/tmux/tmux.h	2017/11/02 21:29:17	1.810
--- src/usr.bin/tmux/tmux.h	2017/11/02 22:00:42	1.811
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.810 2017/11/02 21:29:17 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.811 2017/11/02 22:00:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 2225,2241 ****
  u_int		 layout_set_previous(struct window *);
  
  /* mode-tree.c */
  u_int	 mode_tree_count_tagged(struct mode_tree_data *);
  void	*mode_tree_get_current(struct mode_tree_data *);
! void	 mode_tree_each_tagged(struct mode_tree_data *, void (*)(void *, void *,
! 	     struct client *, key_code), struct client *, key_code, int);
  void	 mode_tree_up(struct mode_tree_data *, int);
  void	 mode_tree_down(struct mode_tree_data *, int);
  struct mode_tree_data *mode_tree_start(struct window_pane *, struct args *,
! 	     void (*)(void *, u_int, uint64_t *, const char *),
! 	     struct screen *(*)(void *, void *, u_int, u_int),
! 	     int (*)(void *, void *, const char *), void *, const char **,
! 	     u_int, struct screen **);
  void	 mode_tree_build(struct mode_tree_data *);
  void	 mode_tree_free(struct mode_tree_data *);
  void	 mode_tree_resize(struct mode_tree_data *, u_int, u_int);
--- 2225,2244 ----
  u_int		 layout_set_previous(struct window *);
  
  /* mode-tree.c */
+ typedef void (*mode_tree_build_cb)(void *, u_int, uint64_t *, const char *);
+ typedef void (*mode_tree_draw_cb)(void *, void *, struct screen_write_ctx *,
+     u_int, u_int);
+ typedef int (*mode_tree_search_cb)(void *, void *, const char *);
+ typedef void (*mode_tree_each_cb)(void *, void *, struct client *, key_code);
  u_int	 mode_tree_count_tagged(struct mode_tree_data *);
  void	*mode_tree_get_current(struct mode_tree_data *);
! void	 mode_tree_each_tagged(struct mode_tree_data *, mode_tree_each_cb,
! 	     struct client *, key_code, int);
  void	 mode_tree_up(struct mode_tree_data *, int);
  void	 mode_tree_down(struct mode_tree_data *, int);
  struct mode_tree_data *mode_tree_start(struct window_pane *, struct args *,
! 	     mode_tree_build_cb, mode_tree_draw_cb, mode_tree_search_cb,
! 	     void *, const char **, u_int, struct screen **);
  void	 mode_tree_build(struct mode_tree_data *);
  void	 mode_tree_free(struct mode_tree_data *);
  void	 mode_tree_resize(struct mode_tree_data *, u_int, u_int);