summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2011-05-05 08:04:31 +0000
committerdes <des@FreeBSD.org>2011-05-05 08:04:31 +0000
commite0b4efa6a76addf228888fc0ab4e4f4bb8b3c034 (patch)
treea9eb668a91847fe7ae4765a858ae74853b44a6ff
parentd1e75087a2c235d6dc7022272f408677091eb037 (diff)
downloadFreeBSD-src-e0b4efa6a76addf228888fc0ab4e4f4bb8b3c034.zip
FreeBSD-src-e0b4efa6a76addf228888fc0ab4e4f4bb8b3c034.tar.gz
Merge from upstream: #include <netinet/ip.h> before checking for macros
that it defines.
-rw-r--r--defines.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/defines.h b/defines.h
index cd27306..b67cf46 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
OpenPOWER on IntegriCloud