From 36a80b2cd639fc82b8fc3d8c3672cc88ae00f1ac Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Mon, 8 Feb 2010 18:29:32 +0000 Subject: Sync OpenBSD patchset 640: Use the array.h code for the causes list. --- tmux.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index 4681e076..f41e4768 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.543 2010-02-08 18:27:34 tcunha Exp $ */ +/* $Id: tmux.h,v 1.544 2010-02-08 18:29:32 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -1243,6 +1243,9 @@ struct set_option_entry { const char **choices; }; +/* List of configuration causes. */ +ARRAY_DECL(causelist, char *); + /* tmux.c */ extern struct options global_options; extern struct options global_s_options; @@ -1261,10 +1264,9 @@ int areshell(const char *); /* cfg.c */ extern int cfg_finished; -extern char **cfg_causes; -extern u_int cfg_ncauses; -void printflike3 cfg_add_cause(u_int *, char ***, const char *, ...); -int load_cfg(const char *, struct cmd_ctx *, u_int *, char ***); +struct causelist cfg_causes; +void printflike2 cfg_add_cause(struct causelist *, const char *, ...); +int load_cfg(const char *, struct cmd_ctx *, struct causelist *); /* mode-key.c */ extern const struct mode_key_table mode_key_tables[]; -- cgit