- (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.c b/monitor.c
index d44f92d59..70403f2dd 100644
--- a/monitor.c
+++ b/monitor.c
@@ -33,12 +33,12 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $");
 #include <skey.h>
 #endif
 
-#include "zlib.h"  /* XXX Moved due to conflict on MacOS/X */
-
 #include "ssh.h"
 #include "auth.h"
 #include "kex.h"
 #include "dh.h"
+#undef TARGET_OS_MAC    /* XXX Broken krb5 headers on Mac */
+#include "zlib.h"
 #include "packet.h"
 #include "auth-options.h"
 #include "sshpty.h"