Merge 3.9p1 to the trunk.

1 files changed, 3 insertions, 3 deletions

diff --git a/log.h b/log.h
index 14700be9c..d7170fc22 100644
--- a/log.h
+++ b/log.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: log.h,v 1.10 2003/09/23 20:17:11 markus Exp $ */
+/*      $OpenBSD: log.h,v 1.11 2004/06/21 22:02:58 djm Exp $    */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -54,7 +54,7 @@ void     log_init(char *, LogLevel, SyslogFacility, int);
 SyslogFacility  log_facility_number(char *);
 LogLevel log_level_number(char *);
 
-void     fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     fatal(const char *, ...) __dead __attribute__((format(printf, 1, 2)));
 void     error(const char *, ...) __attribute__((format(printf, 1, 2)));
 void     logit(const char *, ...) __attribute__((format(printf, 1, 2)));
 void     verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
@@ -63,5 +63,5 @@ void     debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
 void     debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
 
 void     do_log(LogLevel, const char *, va_list);
-void     cleanup_exit(int);
+void     cleanup_exit(int) __dead;
 #endif