Merge branch 'obsd-master'

Conflicts:
	Makefile
	cmd-list-commands.c
	cmd-suspend-client.c
	job.c
	tmux.h
	xmalloc.c
This commit is contained in:
Thomas Adam
2014-10-21 07:11:44 +01:00
100 changed files with 432 additions and 757 deletions

6
log.c
View File

@ -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;