Merge branch 'obsd-master'

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

1 files changed, 3 insertions, 3 deletions

diff --git a/log.c b/log.c
index 5c2889c7..6abbf435 100644
--- a/log.c
+++ b/log.c
@@ -81,7 +81,7 @@ log_vwrite(const char *msg, va_list ap)
 }
 
 /* Log a debug message. */
-void printflike1
+void
 log_debug(const char *msg, ...)
 {
 	va_list	ap;
@@ -92,7 +92,7 @@ log_debug(const char *msg, ...)
 }
 
 /* Log a critical error with error string and die. */
-__dead void printflike1
+__dead void
 log_fatal(const char *msg, ...)
 {
 	char	*fmt;
@@ -106,7 +106,7 @@ log_fatal(const char *msg, ...)
 }
 
 /* Log a critical error and die. */
-__dead void printflike1
+__dead void
 log_fatalx(const char *msg, ...)
 {
 	char	*fmt;