Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-11-18 16:01:23 +00:00
31 changed files with 141 additions and 83 deletions

2
cfg.c
View File

@@ -132,7 +132,7 @@ load_cfg(const char *path, struct cmd_q *cmdq, char **cause)
}
void
cfg_default_done(unused struct cmd_q *cmdq)
cfg_default_done(__unused struct cmd_q *cmdq)
{
if (--cfg_references != 0)
return;