diff options
| author | des <des@FreeBSD.org> | 2011-05-05 08:08:18 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2011-05-05 08:08:18 +0000 |
| commit | 2e02cf00cc81e5fac2eb1ea356e27b032d6920a1 (patch) | |
| tree | 0dda9cd8aaac2cf8205f5a36a2ba29a6f66d7b4e /crypto/openssh | |
| parent | 737b9d0f91a64d6093ac1b8d75340126548bc7d3 (diff) | |
| download | FreeBSD-src-2e02cf00cc81e5fac2eb1ea356e27b032d6920a1.zip FreeBSD-src-2e02cf00cc81e5fac2eb1ea356e27b032d6920a1.tar.gz | |
Merge two upstream patches from vendor branch. No functional changes.
Diffstat (limited to 'crypto/openssh')
| -rw-r--r-- | crypto/openssh/ChangeLog | 1 | ||||
| -rw-r--r-- | crypto/openssh/defines.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/ChangeLog b/crypto/openssh/ChangeLog index 7fdf1ec..f51d17e 100644 --- a/crypto/openssh/ChangeLog +++ b/crypto/openssh/ChangeLog @@ -1,6 +1,7 @@ 20110403 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Prepare for 5.8p2 release. + - (djm) [version.h] crank version - Release 5.8p2 20110329 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 |
