summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-05 11:19:13 +1000
committerDamien Miller <djm@mindrot.org>2011-05-05 11:19:13 +1000
commit68790fedef210e03e36534b111e2f27b858170b4 (patch)
treea95c409cb1adfc6395ce3ff99db5f8e61ddef1c4
parenta10abe9e4be4ca3b5da71c34c6f5f1844336958e (diff)
- (djm) [defines.h] Move up include of netinet/ip.h for IPTOS
definitions.
-rw-r--r--ChangeLog4
-rw-r--r--defines.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 56fe35211..0105a95ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120110505
2 - (djm) [defines.h] Move up include of netinet/ip.h for IPTOS
3 definitions. From des AT des.no
4
120110221 520110221
2 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the 6 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
3 Cygwin-specific service installer script ssh-host-config. The actual 7 Cygwin-specific service installer script ssh-host-config. The actual
diff --git a/defines.h b/defines.h
index cd273066d..b67cf467d 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.164 2011/01/17 10:15:31 dtucker Exp $ */ 28/* $Id: defines.h,v 1.165 2011/05/05 01:19:15 djm Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -45,6 +45,8 @@ enum
45/* 45/*
46 * Definitions for IP type of service (ip_tos) 46 * Definitions for IP type of service (ip_tos)
47 */ 47 */
48#include <netinet/in_systm.h>
49#include <netinet/ip.h>
48#ifndef IPTOS_LOWDELAY 50#ifndef IPTOS_LOWDELAY
49# define IPTOS_LOWDELAY 0x10 51# define IPTOS_LOWDELAY 0x10
50# define IPTOS_THROUGHPUT 0x08 52# define IPTOS_THROUGHPUT 0x08
@@ -56,8 +58,6 @@ enum
56/* 58/*
57 * Definitions for DiffServ Codepoints as per RFC2474 59 * Definitions for DiffServ Codepoints as per RFC2474
58 */ 60 */
59#include <netinet/in_systm.h>
60#include <netinet/ip.h>
61#ifndef IPTOS_DSCP_AF11 61#ifndef IPTOS_DSCP_AF11
62# define IPTOS_DSCP_AF11 0x28 62# define IPTOS_DSCP_AF11 0x28
63# define IPTOS_DSCP_AF12 0x30 63# define IPTOS_DSCP_AF12 0x30