diff options
| author | Damien Miller <djm@mindrot.org> | 2010-09-10 03:20:59 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-09-10 03:20:59 +0200 |
| commit | 3796ab47d3f68f69512c360f178b77bf0fb12b4f (patch) | |
| tree | 804df432d1b1870438dbdff884f761b808182df9 | |
| parent | - djm@cvs.openbsd.org 2010/09/08 03:54:36 (diff) | |
| download | openssh-3796ab47d3f68f69512c360f178b77bf0fb12b4f.tar.xz openssh-3796ab47d3f68f69512c360f178b77bf0fb12b4f.zip | |
- deraadt@cvs.openbsd.org 2010/09/08 04:13:31
[compress.c]
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-- | ChangeLog | 6 | ||||
| -rw-r--r-- | compress.c | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -43,6 +43,12 @@ - djm@cvs.openbsd.org 2010/09/08 03:54:36 [authfile.c] typo + - deraadt@cvs.openbsd.org 2010/09/08 04:13:31 + [compress.c] + 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 20100831 - OpenBSD CVS Sync diff --git a/compress.c b/compress.c index c058d2224..24778e524 100644 --- a/compress.c +++ b/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 @@ -17,12 +17,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; |