From 3324f39134268853f05c7590761bcb0675159ab7 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Sat, 12 Aug 2006 20:46:47 +0000
Subject: 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)

---
 usr.bin/ssh/monitor.c      | 4 ++--
 usr.bin/ssh/monitor_wrap.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'usr.bin/ssh')

diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index b3da22e92cd..91a9f859316 100644
--- a/usr.bin/ssh/monitor.c
+++ b/usr.bin/ssh/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>
@@ -40,7 +40,6 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include <zlib.h>
 
 #ifdef SKEY
 #include <skey.h>
@@ -55,6 +54,7 @@
 #include "cipher.h"
 #include "kex.h"
 #include "dh.h"
+#include <zlib.h>
 #include "packet.h"
 #include "auth-options.h"
 #include "sshpty.h"
diff --git a/usr.bin/ssh/monitor_wrap.c b/usr.bin/ssh/monitor_wrap.c
index 0a281c3a250..15eeab8b764 100644
--- a/usr.bin/ssh/monitor_wrap.c
+++ b/usr.bin/ssh/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>
@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <zlib.h>
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -52,6 +51,7 @@
 #include "packet.h"
 #include "mac.h"
 #include "log.h"
+#include <zlib.h>
 #include "monitor.h"
 #ifdef GSSAPI
 #include "ssh-gss.h"
-- 
cgit v1.2.3