upstream: remove unused zlib.h

OpenBSD-Commit-ID: 8d274a9b467c7958df12668b49144056819f79f1
This commit is contained in:
djm@openbsd.org 2018-07-20 03:46:34 +00:00 committed by Damien Miller
parent 3ba6e68835
commit 6ad8648e83
2 changed files with 2 additions and 16 deletions

View File

@ -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 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -76,13 +76,6 @@
#include "kex.h" #include "kex.h"
#include "dh.h" #include "dh.h"
#include "auth-pam.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 "packet.h"
#include "auth-options.h" #include "auth-options.h"
#include "sshpty.h" #include "sshpty.h"

View File

@ -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 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -61,13 +61,6 @@
#include "mac.h" #include "mac.h"
#include "log.h" #include "log.h"
#include "auth-pam.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" #include "monitor.h"
#ifdef GSSAPI #ifdef GSSAPI
#include "ssh-gss.h" #include "ssh-gss.h"