summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--monitor.c9
-rw-r--r--monitor_wrap.c9
2 files changed, 2 insertions, 16 deletions
diff --git a/monitor.c b/monitor.c
index f5d1b8a0..78f9c503 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.185 2018/07/11 18:53:29 markus Exp $ */
+/* $OpenBSD: monitor.c,v 1.186 2018/07/20 03:46:34 djm Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -76,13 +76,6 @@
#include "kex.h"
#include "dh.h"
#include "auth-pam.h"
-#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 96636aed..3cb26c2a 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.106 2018/07/11 18:53:29 markus Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.107 2018/07/20 03:46:34 djm Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -61,13 +61,6 @@
#include "mac.h"
#include "log.h"
#include "auth-pam.h"
-#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"
#ifdef GSSAPI
#include "ssh-gss.h"