diff options
| author | des <des@FreeBSD.org> | 2004-10-28 16:11:31 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-10-28 16:11:31 +0000 |
| commit | a744ec13ade7d70128cd82393862d02c1f712f6a (patch) | |
| tree | 2b93d7eeb78a97c2cc9e93d61346f39150ed165f /crypto/openssh/log.h | |
| parent | ca12ec184bb7b4d1d0ff5dc213f5da06de091b8c (diff) | |
| download | FreeBSD-src-a744ec13ade7d70128cd82393862d02c1f712f6a.zip FreeBSD-src-a744ec13ade7d70128cd82393862d02c1f712f6a.tar.gz | |
Resolve conflicts
Diffstat (limited to 'crypto/openssh/log.h')
| -rw-r--r-- | crypto/openssh/log.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/log.h b/crypto/openssh/log.h index ca4d7bf..ec64752 100644 --- a/crypto/openssh/log.h +++ b/crypto/openssh/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 $ */ /* $FreeBSD$ */ /* @@ -62,7 +62,7 @@ LogLevel log_level_number(char *); #define debug2 ssh_debug2 #define debug3 ssh_debug3 -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))); @@ -71,5 +71,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 |
