Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-11-18 14:01:12 +00:00
7 changed files with 125 additions and 102 deletions

4
log.c
View File

@ -101,7 +101,7 @@ log_debug(const char *msg, ...)
/* Log a critical error with error string and die. */
__dead void
log_fatal(const char *msg, ...)
fatal(const char *msg, ...)
{
char *fmt;
va_list ap;
@ -115,7 +115,7 @@ log_fatal(const char *msg, ...)
/* Log a critical error and die. */
__dead void
log_fatalx(const char *msg, ...)
fatalx(const char *msg, ...)
{
char *fmt;
va_list ap;