diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-12 09:45:49 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-12 09:45:49 +0100 |
| commit | b9dc855016cf79c8bb8469c272dbc6bca24deadc (patch) | |
| tree | a2049bea7b17ededbd12b77110d47353ed832e46 /cfg.c | |
| parent | 27126f87976c63161fcae2ab1eb9c6df726a84ff (diff) | |
| parent | 5c49e1d0c1afaf98512b2ffd1f31d91fecff9851 (diff) | |
| download | rtmux-b9dc855016cf79c8bb8469c272dbc6bca24deadc.tar.gz rtmux-b9dc855016cf79c8bb8469c272dbc6bca24deadc.tar.bz2 rtmux-b9dc855016cf79c8bb8469c272dbc6bca24deadc.zip | |
Merge branch 'obsd-master'
Conflicts:
format.c
osdep-openbsd.c
Diffstat (limited to 'cfg.c')
| -rw-r--r-- | cfg.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -27,15 +27,15 @@ #include "tmux.h" -char *cfg_file; -struct cmd_q *cfg_cmd_q; -int cfg_finished; -int cfg_references; -char **cfg_causes; -u_int cfg_ncauses; -struct client *cfg_client; +char *cfg_file; +static struct cmd_q *cfg_cmd_q; +int cfg_finished; +int cfg_references; +static char **cfg_causes; +static u_int cfg_ncauses; +struct client *cfg_client; -void cfg_default_done(struct cmd_q *); +static void cfg_default_done(struct cmd_q *); void set_cfg_file(const char *path) @@ -125,7 +125,7 @@ load_cfg(const char *path, struct cmd_q *cmdq, int quiet) return (found); } -void +static void cfg_default_done(__unused struct cmd_q *cmdq) { if (--cfg_references != 0) |