From 2e02cf00cc81e5fac2eb1ea356e27b032d6920a1 Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Thu, 5 May 2011 08:08:18 +0000
Subject: Merge two upstream patches from vendor branch.  No functional
 changes.

---
 crypto/openssh/defines.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crypto/openssh/defines.h')

diff --git a/crypto/openssh/defines.h b/crypto/openssh/defines.h
index a74392f..b67cf46 100644
--- a/crypto/openssh/defines.h
+++ b/crypto/openssh/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.164 2011/01/17 10:15:31 dtucker Exp $ */
+/* $Id: defines.h,v 1.165 2011/05/05 01:19:15 djm Exp $ */
 
 
 /* Constants */
@@ -45,6 +45,7 @@ enum
 /*
  * Definitions for IP type of service (ip_tos)
  */
+#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #ifndef IPTOS_LOWDELAY
 # define IPTOS_LOWDELAY          0x10
@@ -57,7 +58,6 @@ enum
 /*
  * Definitions for DiffServ Codepoints as per RFC2474
  */
-#include <netinet/in_systm.h>
 #ifndef IPTOS_DSCP_AF11
 # define	IPTOS_DSCP_AF11		0x28
 # define	IPTOS_DSCP_AF12		0x30
-- 
cgit v1.1