From 3796ab47d3f68f69512c360f178b77bf0fb12b4f Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 10 Sep 2010 11:20:59 +1000
Subject:    - 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

---
 compress.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'compress.c')

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;
-- 
cgit v1.2.3