From: djm <djm>
Date: Fri, 18 Aug 2006 14:22:40 +0000 (+0000)
Subject:    - miod@cvs.openbsd.org 2006/08/12 20:46:46
X-Git-Tag: V_4_4_P1~76
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/ba52fb567358257efd557b4524d9584f9051214f

   - miod@cvs.openbsd.org 2006/08/12 20:46:46
     [monitor.c monitor_wrap.c]
     Revert previous include file ordering change, for ssh to compile under
     gcc2 (or until openssl include files are cleaned of parameter names
     in function prototypes)
---

diff --git a/ChangeLog b/ChangeLog
index 0be60880..9d812b5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@
    - stevesk@cvs.openbsd.org 2006/08/06 01:13:32
      [compress.c monitor.c monitor_wrap.c]
      "zlib.h" can be <zlib.h>; ok djm@ markus@
+   - miod@cvs.openbsd.org 2006/08/12 20:46:46
+     [monitor.c monitor_wrap.c]
+     Revert previous include file ordering change, for ssh to compile under
+     gcc2 (or until openssl include files are cleaned of parameter names
+     in function prototypes)
 
 20060817
  - (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c]
diff --git a/monitor.c b/monitor.c
index 9e6bcc85..83b3765a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.87 2006/08/06 01:13:32 stevesk Exp $ */
+/* $OpenBSD: monitor.c,v 1.88 2006/08/12 20:46:46 miod Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -42,7 +42,6 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include <zlib.h>
 
 #ifdef SKEY
 #include <skey.h>
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 5d6ad25f..431b3e49 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.53 2006/08/06 01:13:32 stevesk Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.54 2006/08/12 20:46:46 miod Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -36,7 +36,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <zlib.h>
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>