=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v retrieving revision 1.495 retrieving revision 1.496 diff -c -r1.495 -r1.496 *** src/usr.bin/tmux/tmux.h 2015/04/22 15:05:03 1.495 --- src/usr.bin/tmux/tmux.h 2015/04/22 15:30:11 1.496 *************** *** 1,4 **** ! /* $OpenBSD: tmux.h,v 1.495 2015/04/22 15:05:03 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: tmux.h,v 1.496 2015/04/22 15:30:11 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott *************** *** 983,990 **** struct options options; u_int references; }; ! ARRAY_DECL(windows, struct window *); /* Entry on local window list. */ struct winlink { --- 983,992 ---- struct options options; u_int references; + + RB_ENTRY(window) entry; }; ! RB_HEAD(windows, window); /* Entry on local window list. */ struct winlink { *************** *** 2121,2126 **** --- 2123,2130 ---- /* window.c */ extern struct windows windows; extern struct window_pane_tree all_window_panes; + int window_cmp(struct window *, struct window *); + RB_PROTOTYPE(windows, window, entry, window_cmp); int winlink_cmp(struct winlink *, struct winlink *); RB_PROTOTYPE(winlinks, winlink, entry, winlink_cmp); int window_pane_cmp(struct window_pane *, struct window_pane *);