- (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)

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"