diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-09-08 04:13:32 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-09-08 04:13:32 +0000 |
| commit | 0c1192d0d6ddb12187a7152d81e060ac4a4dcb50 (patch) | |
| tree | 6cd12fc771a541eb2fee18cd86919bae4a159d50 /usr.bin/ssh/compress.c | |
| parent | 989decdd4d45ca09220c0d800610ef129591892b (diff) | |
work around name-space collisions some buggy compilers (looking at you
gcc, at least in earlier versions, but this does not forgive your current
transgressions) seen between zlib and openssl
ok djm
Diffstat (limited to 'usr.bin/ssh/compress.c')
| -rw-r--r-- | usr.bin/ssh/compress.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/compress.c b/usr.bin/ssh/compress.c index 8d8ab9f8923..d4ddaee5511 100644 --- a/usr.bin/ssh/compress.c +++ b/usr.bin/ssh/compress.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compress.c,v 1.25 2006/08/06 01:13:32 stevesk Exp $ */ +/* $OpenBSD: compress.c,v 1.26 2010/09/08 04:13:31 deraadt Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -15,12 +15,13 @@ #include <sys/types.h> #include <stdarg.h> -#include <zlib.h> #include "log.h" #include "buffer.h" #include "compress.h" +#include <zlib.h> + z_stream incoming_stream; z_stream outgoing_stream; static int compress_init_send_called = 0; |