diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2004-04-08 07:11:03 +0200 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2004-04-08 07:11:03 +0200 |
| commit | 1b9f2a6b44d09b21304c06e36c3cb4577937c0f9 (patch) | |
| tree | 70c65778baa3cf1eb11f06422a6cf6277abadcb0 /monitor_wrap.c | |
| parent | - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating (diff) | |
| download | openssh-1b9f2a6b44d09b21304c06e36c3cb4577937c0f9.tar.xz openssh-1b9f2a6b44d09b21304c06e36c3cb4577937c0f9.zip | |
- (bal) [monitor.c monitor_wrap.c] Second try. Put the zlib.h headers
back and #undef TARGET_OS_MAC instead. (Bug report pending with Apple)
Diffstat (limited to 'monitor_wrap.c')
| -rw-r--r-- | monitor_wrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index 9e0417bdc..fc506d267 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -30,8 +30,6 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); #include <openssl/bn.h> #include <openssl/dh.h> -#include "zlib.h" /* XXX Moved due to conflict on MacOS/X */ - #include "ssh.h" #include "dh.h" #include "kex.h" @@ -42,6 +40,8 @@ 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 */ +#include "zlib.h" #include "monitor.h" #include "monitor_wrap.h" #include "xmalloc.h" |