===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.482
retrieving revision 1.483
diff -c -r1.482 -r1.483
*** src/usr.bin/tmux/tmux.h	2014/11/30 08:03:29	1.482
--- src/usr.bin/tmux/tmux.h	2014/12/02 23:19:45	1.483
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.482 2014/11/30 08:03:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.483 2014/12/02 23:19:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1461,1475 ****
  	const char	       *style;
  };
  
- /* Tree of format entries. */
- struct format_entry {
- 	char		       *key;
- 	char		       *value;
- 
- 	RB_ENTRY(format_entry)	entry;
- };
- RB_HEAD(format_tree, format_entry);
- 
  /* Common command usages. */
  #define CMD_TARGET_PANE_USAGE "[-t target-pane]"
  #define CMD_TARGET_WINDOW_USAGE "[-t target-window]"
--- 1461,1466 ----
***************
*** 1513,1520 ****
  void		 cfg_show_causes(struct session *);
  
  /* format.c */
! int		 format_cmp(struct format_entry *, struct format_entry *);
! RB_PROTOTYPE(format_tree, format_entry, entry, format_cmp);
  struct format_tree *format_create(void);
  void		 format_free(struct format_tree *);
  void printflike(3, 4) format_add(struct format_tree *, const char *,
--- 1504,1510 ----
  void		 cfg_show_causes(struct session *);
  
  /* format.c */
! struct format_tree;
  struct format_tree *format_create(void);
  void		 format_free(struct format_tree *);
  void printflike(3, 4) format_add(struct format_tree *, const char *,