summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Steves <stevesk@cvs.openbsd.org>2006-08-06 01:13:33 +0000
committerKevin Steves <stevesk@cvs.openbsd.org>2006-08-06 01:13:33 +0000
commit1fe27710eed1b95e845bc20991db25b275a2eb23 (patch)
treeffcc071990d201811b29bc2f3c72a62fb16999ba
parent9fdb8b6e60d000837fdcdcf6a9abf7d4e22822b5 (diff)
"zlib.h" can be <zlib.h>; ok djm@ markus@
-rw-r--r--usr.bin/ssh/compress.c4
-rw-r--r--usr.bin/ssh/monitor.c4
-rw-r--r--usr.bin/ssh/monitor_wrap.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/compress.c b/usr.bin/ssh/compress.c
index bcaa26e3f65..8d8ab9f8923 100644
--- a/usr.bin/ssh/compress.c
+++ b/usr.bin/ssh/compress.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compress.c,v 1.24 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: compress.c,v 1.25 2006/08/06 01:13:32 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -15,10 +15,10 @@
#include <sys/types.h>
#include <stdarg.h>
+#include <zlib.h>
#include "log.h"
#include "buffer.h"
-#include "zlib.h"
#include "compress.h"
z_stream incoming_stream;
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index 0b5a1ccd36c..b3da22e92cd 100644
--- a/usr.bin/ssh/monitor.c
+++ b/usr.bin/ssh/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.86 2006/08/04 20:46:05 stevesk Exp $ */
+/* $OpenBSD: monitor.c,v 1.87 2006/08/06 01:13:32 stevesk Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -40,6 +40,7 @@
#include <signal.h>
#include <stdlib.h>
#include <string.h>
+#include <zlib.h>
#ifdef SKEY
#include <skey.h>
@@ -54,7 +55,6 @@
#include "cipher.h"
#include "kex.h"
#include "dh.h"
-#include "zlib.h"
#include "packet.h"
#include "auth-options.h"
#include "sshpty.h"
diff --git a/usr.bin/ssh/monitor_wrap.c b/usr.bin/ssh/monitor_wrap.c
index a27e7fcc839..0a281c3a250 100644
--- a/usr.bin/ssh/monitor_wrap.c
+++ b/usr.bin/ssh/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.52 2006/08/05 08:28:24 dtucker Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.53 2006/08/06 01:13:32 stevesk Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -37,6 +37,7 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#include <zlib.h>
#include "xmalloc.h"
#include "ssh.h"
@@ -51,7 +52,6 @@
#include "packet.h"
#include "mac.h"
#include "log.h"
-#include "zlib.h"
#include "monitor.h"
#ifdef GSSAPI
#include "ssh-gss.h"