Merge branch 'obsd-master'

Conflicts:
	Makefile
	cmd-list-commands.c
	cmd-suspend-client.c
	job.c
	tmux.h
	xmalloc.c

1 files changed, 1 insertions, 1 deletions

diff --git a/options.c b/options.c
index 8bec8e5c..67885c60 100644
--- a/options.c
+++ b/options.c
@@ -99,7 +99,7 @@ options_remove(struct options *oo, const char *name)
 	free(o);
 }
 
-struct options_entry *printflike3
+struct options_entry *
 options_set_string(struct options *oo, const char *name, const char *fmt, ...)
 {
 	struct options_entry	*o;