From a8104b5c92a44774208e6d8b979d583975ba67d4 Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Wed, 7 Apr 2004 04:16:11 +0000
Subject:  - (bal) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Check
 to see    if Krb5 library exports krb5_init_etc() since some OSes (like
 MacOS/X)    are starting to restrict it as internal since it is not needed by
     developers any more. (Patch based on Apple tree) - (bal) [monitor.c
 monitor_wrap.c] monitor_wrap.c] moved zlib.h higher since     krb5 on MacOS/X
 conflicts.  There may be a better solution, but this will     work for now.

---
 monitor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'monitor.c')

diff --git a/monitor.c b/monitor.c
index 30f7258a0..d44f92d59 100644
--- a/monitor.c
+++ b/monitor.c
@@ -33,11 +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"
-#include "zlib.h"
 #include "packet.h"
 #include "auth-options.h"
 #include "sshpty.h"
-- 
cgit v1.2.3