summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tmux.h
diff options
context:
space:
mode:
authortim <tim@openbsd.org>2016-05-12 16:05:33 +0000
committertim <tim@openbsd.org>2016-05-12 16:05:33 +0000
commit59c70a5f496903cd63171d4b0571fc530f9ac47a (patch)
treeb0ba2f331668a3447170fc84db239c9735e4a3fa /usr.bin/tmux/tmux.h
parentUsing a 3-word buffer in the openbsd.randomdata segment, XOR swizzle (diff)
downloadwireguard-openbsd-59c70a5f496903cd63171d4b0571fc530f9ac47a.tar.xz
wireguard-openbsd-59c70a5f496903cd63171d4b0571fc530f9ac47a.zip
- Rework load_cfg() error handling a little.
- Add -q to source-file to suppress errors about nonexistent files. Input and OK nicm@
Diffstat (limited to 'usr.bin/tmux/tmux.h')
-rw-r--r--usr.bin/tmux/tmux.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 46ecf21ade8..5a24d0e03ab 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.629 2016/05/01 13:39:05 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.630 2016/05/12 16:05:33 tim Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1555,7 +1555,7 @@ extern int cfg_finished;
extern int cfg_references;
extern struct client *cfg_client;
void start_cfg(void);
-int load_cfg(const char *, struct cmd_q *, char **);
+int load_cfg(const char *, struct cmd_q *, int);
void set_cfg_file(const char *);
void printflike(1, 2) cfg_add_cause(const char *, ...);
void cfg_print_causes(struct cmd_q *);