diff options
| author |   deraadt <deraadt@openbsd.org> | 2010-09-08 04:13:31 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2010-09-08 04:13:31 +0000 |
| commit | 3e354d32b28946eda03832bedb3a000ddbf0338b (patch) | |
| tree | efb21e038675bbdf92d2f2083458d60ef80a1ee4 | |
| parent | typo (diff) | |
| download | wireguard-openbsd-3e354d32b28946eda03832bedb3a000ddbf0338b.tar.xz wireguard-openbsd-3e354d32b28946eda03832bedb3a000ddbf0338b.zip | |
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
| -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; |