tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Damien Miller 2010-09-10 11:20:59 +10:00
parent bf0423e550
commit 3796ab47d3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -43,6 +43,12 @@
- djm@cvs.openbsd.org 2010/09/08 03:54:36 - djm@cvs.openbsd.org 2010/09/08 03:54:36
[authfile.c] [authfile.c]
typo 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 20100831
- OpenBSD CVS Sync - OpenBSD CVS Sync

5
compress.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -17,12 +17,13 @@
#include <sys/types.h> #include <sys/types.h>
#include <stdarg.h> #include <stdarg.h>
#include <zlib.h>
#include "log.h" #include "log.h"
#include "buffer.h" #include "buffer.h"
#include "compress.h" #include "compress.h"
#include <zlib.h>
z_stream incoming_stream; z_stream incoming_stream;
z_stream outgoing_stream; z_stream outgoing_stream;
static int compress_init_send_called = 0; static int compress_init_send_called = 0;