From 194a1cb0189e41db76feb9363a89fe716f7cad97 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 10 Jul 2006 21:09:22 +1000
Subject: [PATCH]    - stevesk@cvs.openbsd.org 2006/07/08 23:30:06      [log.c]
      move user includes after /usr/include files

---
 ChangeLog | 5 ++++-
 log.c     | 8 ++++----
 monitor.c | 1 -
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9d93ab4a1..3acb62484 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,9 @@
      [monitor.c session.c]
      missed these from last commit:
      move #include <sys/socket.h> out of includes.h
+   - stevesk@cvs.openbsd.org 2006/07/08 23:30:06
+     [log.c]
+     move user includes after /usr/include files
 
 20060706
  - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4798,4 +4801,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4375 2006/07/10 11:08:34 djm Exp $
+$Id: ChangeLog,v 1.4376 2006/07/10 11:09:22 djm Exp $
diff --git a/log.c b/log.c
index 3a404918b..f7f92bcac 100644
--- a/log.c
+++ b/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.31 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: log.c,v 1.32 2006/07/08 23:30:06 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -36,14 +36,14 @@
 
 #include "includes.h"
 
-#include "log.h"
-#include "xmalloc.h"
-
 #include <syslog.h>
 #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H)
 # include <vis.h>
 #endif
 
+#include "log.h"
+#include "xmalloc.h"
+
 static LogLevel log_level = SYSLOG_LEVEL_INFO;
 static int log_on_stderr = 1;
 static int log_facility = LOG_AUTH;
diff --git a/monitor.c b/monitor.c
index f01f921ae..73306948a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -30,7 +30,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <sys/socket.h>
 
 #ifdef HAVE_PATHS_H
 #include <paths.h>