Sync OpenBSD patchset 640:

Use the array.h code for the causes list.

1 files changed, 7 insertions, 5 deletions

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 <nicm@users.sourceforge.net>
@@ -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[];