From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 28 Aug 2015 13:31:03 +0000 (+0200)
Subject: Move nfmark_t and tos_t declarations to ip/forward.h
X-Git-Tag: SQUID_4_0_1~81^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9538350f1525db0c285b5c31bee603ef37cc70d;p=thirdparty%2Fsquid.git

Move nfmark_t and tos_t declarations to ip/forward.h
---

diff --git a/src/comm/Connection.h b/src/comm/Connection.h
index a9fb15040a..2743bc595a 100644
--- a/src/comm/Connection.h
+++ b/src/comm/Connection.h
@@ -16,7 +16,7 @@
 #include "hier_code.h"
 #include "ip/Address.h"
 #include "mem/forward.h"
-#include "typedefs.h"
+#include "ip/forward.h"
 #if USE_SQUID_EUI
 #include "eui/Eui48.h"
 #include "eui/Eui64.h"
diff --git a/src/fde.h b/src/fde.h
index 0314a98fd1..e3a8c2653a 100644
--- a/src/fde.h
+++ b/src/fde.h
@@ -12,6 +12,7 @@
 #include "comm.h"
 #include "defines.h"
 #include "ip/Address.h"
+#include "ip/forward.h"
 #include "security/forward.h"
 
 #if USE_DELAY_POOLS
diff --git a/src/ip/forward.h b/src/ip/forward.h
index 06cb349e09..8669822a3b 100644
--- a/src/ip/forward.h
+++ b/src/ip/forward.h
@@ -17,5 +17,9 @@ namespace Ip
 {
 class Address;
 }
+
+typedef uint32_t nfmark_t;
+typedef unsigned char tos_t;
+
 #endif /* _SQUID_IP_FORWARD_H */
 
diff --git a/src/typedefs.h b/src/typedefs.h
index 041c1cd5b2..c7849748ed 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -11,9 +11,6 @@
 #ifndef SQUID_TYPEDEFS_H
 #define SQUID_TYPEDEFS_H
 
-typedef uint32_t nfmark_t;
-typedef unsigned char tos_t;
-
 typedef struct {
     size_t bytes;
     size_t kb;