diff options
| author | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
| commit | 124c4a14153799ec55cc535db5222b1780208aa1 (patch) | |
| tree | 91bbaf12f7d9b9158ae725f996c95f18038af40c /crypto/openssh/log.h | |
| parent | 1754c77e5e8ce4ec5f746dc5ce34e4cb54e3130f (diff) | |
| download | FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.zip FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/log.h')
| -rw-r--r-- | crypto/openssh/log.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/crypto/openssh/log.h b/crypto/openssh/log.h index 555f089..ca4d7bf 100644 --- a/crypto/openssh/log.h +++ b/crypto/openssh/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.9 2003/04/08 20:21:28 itojun Exp $ */ +/* $OpenBSD: log.h,v 1.10 2003/09/23 20:17:11 markus Exp $ */ /* $FreeBSD$ */ /* @@ -70,11 +70,6 @@ void debug(const char *, ...) __attribute__((format(printf, 1, 2))); void debug2(const char *, ...) __attribute__((format(printf, 1, 2))); void debug3(const char *, ...) __attribute__((format(printf, 1, 2))); -void fatal_cleanup(void); -void fatal_add_cleanup(void (*) (void *), void *); -void fatal_remove_cleanup(void (*) (void *), void *); -void fatal_remove_all_cleanups(void); - void do_log(LogLevel, const char *, va_list); - +void cleanup_exit(int); #endif |
