summaryrefslogtreecommitdiffstats
path: root/compress.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-09-10 11:20:59 +1000
committerDamien Miller <djm@mindrot.org>2010-09-10 11:20:59 +1000
commit3796ab47d3f68f69512c360f178b77bf0fb12b4f (patch)
tree804df432d1b1870438dbdff884f761b808182df9 /compress.c
parentbf0423e550e47bc4b3a40fe165da4e5c68b4aa5c (diff)
- 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
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 c058d222..24778e52 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;