diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2004-04-08 16:12:30 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2004-04-08 16:12:30 +0000 |
commit | 036768e48c6039b0f784453cbc388078f72c8d53 (patch) | |
tree | cbf2d4f603740eb17eac40dcd2107901ceee5b6e | |
parent | 11f18294abc3316ed2d8e38c92bd7bd1bbb134e4 (diff) |
- (bal) [monitor.c monitor_wrap.c] Ok.. Last time. Promise. Tim suggested
limiting scope and dtucker@ agreed.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | monitor.c | 7 | ||||
-rw-r--r-- | monitor_wrap.c | 7 |
3 files changed, 15 insertions, 3 deletions
@@ -5,6 +5,8 @@ back and #undef TARGET_OS_MAC instead. (Bug report pending with Apple) - (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and simplify loginrec.c. ok tim@ + - (bal) [monitor.c monitor_wrap.c] Ok.. Last time. Promise. Tim suggested + limiting scope and dtucker@ agreed. 20040407 - (dtucker) [session.c] Flush stdout after displaying loginmsg. From @@ -955,4 +957,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3306 2004/04/08 06:16:06 dtucker Exp $ +$Id: ChangeLog,v 1.3307 2004/04/08 16:12:30 mouring Exp $ @@ -37,8 +37,13 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $"); #include "auth.h" #include "kex.h" #include "dh.h" -#undef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ +#ifdef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ +#undef TARGET_OS_MAC #include "zlib.h" +#define TARGET_OS_MAC 1 +#else +#include "zlib.h" +#endif #include "packet.h" #include "auth-options.h" #include "sshpty.h" diff --git a/monitor_wrap.c b/monitor_wrap.c index fc506d26..ee2dc202 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -40,8 +40,13 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); #include "packet.h" #include "mac.h" #include "log.h" -#undef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ +#ifdef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ +#undef TARGET_OS_MAC #include "zlib.h" +#define TARGET_OS_MAC 1 +#else +#include "zlib.h" +#endif #include "monitor.h" #include "monitor_wrap.h" #include "xmalloc.h" |