summaryrefslogtreecommitdiff
path: root/compress.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-01-24 11:46:57 +0000
committerColin Watson <cjwatson@debian.org>2011-01-24 11:46:57 +0000
commit0970072c89b079b022538e3c366fbfa2c53fc821 (patch)
treeb7024712d74234bb5a8b036ccbc9109e2e211296 /compress.c
parent4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff)
parent478ff799463ca926a8dfbabf058f4e84aaffc65a (diff)
merge 5.7p1
Diffstat (limited to 'compress.c')
-rw-r--r--compress.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/compress.c b/compress.c
index c058d2224..24778e524 100644
--- a/compress.c
+++ b/compress.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: compress.c,v 1.25 2006/08/06 01:13:32 stevesk Exp $ */ 1/* $OpenBSD: compress.c,v 1.26 2010/09/08 04:13:31 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -17,12 +17,13 @@
17#include <sys/types.h> 17#include <sys/types.h>
18 18
19#include <stdarg.h> 19#include <stdarg.h>
20#include <zlib.h>
21 20
22#include "log.h" 21#include "log.h"
23#include "buffer.h" 22#include "buffer.h"
24#include "compress.h" 23#include "compress.h"
25 24
25#include <zlib.h>
26
26z_stream incoming_stream; 27z_stream incoming_stream;
27z_stream outgoing_stream; 28z_stream outgoing_stream;
28static int compress_init_send_called = 0; 29static int compress_init_send_called = 0;