From 1b9f2a6b44d09b21304c06e36c3cb4577937c0f9 Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Thu, 8 Apr 2004 05:11:03 +0000
Subject:  - (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)

---
 monitor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'monitor.c')

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"
-- 
cgit v1.2.3