- (bal) [monitor.c monitor_wrap.c] Ok.. Last time. Promise. Tim suggested

   limiting scope and dtucker@ agreed.

diff --git a/ChangeLog b/ChangeLog
index 2218364303a720bfbd9861ca3d0812909e35ee0b..7b7af8ddb9f97f9e4b57382855a35c2e37fd80da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/monitor.c b/monitor.c
index 70403f2dd9ce447cdefbfb409899b1a15379a671..37d40fcca91ccec77e21acb4edf45c9721fd4530 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -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 fc506d267348c3c58bcbf585e933466774a2f030..ee2dc20270be65536c5f83a50a3a0ccd82ef474a 100644 (file)
--- 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"