diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-07-20 05:46:34 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-07-20 06:32:07 +0200 |
| commit | 6ad8648e83e4f4ace37b742a05c2a6b6b872514e (patch) | |
| tree | 7496a031f6d60fe6d71f73d16b72fbe2569156e2 | |
| parent | upstream: Fix typo in comment. From Alexandru Iacob via github. (diff) | |
| download | openssh-6ad8648e83e4f4ace37b742a05c2a6b6b872514e.tar.xz openssh-6ad8648e83e4f4ace37b742a05c2a6b6b872514e.zip | |
upstream: remove unused zlib.h
OpenBSD-Commit-ID: 8d274a9b467c7958df12668b49144056819f79f1
| -rw-r--r-- | monitor.c | 9 | ||||
| -rw-r--r-- | monitor_wrap.c | 9 |
2 files changed, 2 insertions, 16 deletions
@@ -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 96636aede..3cb26c2ac 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" |