diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2011-05-05 08:04:31 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2011-05-05 08:04:31 +0000 |
| commit | 9dfebb6defeefa56f391ad3c4146082ecab35c65 (patch) | |
| tree | a9eb668a91847fe7ae4765a858ae74853b44a6ff | |
| parent | 673b8ab1d69c60e1fceb3abb1682e5843f01ca6a (diff) | |
| download | src-9dfebb6defeefa56f391ad3c4146082ecab35c65.tar.gz src-9dfebb6defeefa56f391ad3c4146082ecab35c65.zip | |
Merge from upstream: #include <netinet/ip.h> before checking for macros
that it defines.
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=221486
| -rw-r--r-- | defines.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/defines.h b/defines.h index cd273066daf5..b67cf467dcf1 100644 --- a/defines.h +++ b/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,8 @@ 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 # define IPTOS_THROUGHPUT 0x08 @@ -56,8 +58,6 @@ enum /* * Definitions for DiffServ Codepoints as per RFC2474 */ -#include <netinet/in_systm.h> -#include <netinet/ip.h> #ifndef IPTOS_DSCP_AF11 # define IPTOS_DSCP_AF11 0x28 # define IPTOS_DSCP_AF12 0x30 |