Move nfmark_t and tos_t declarations to ip/forward.h

diff --git a/src/comm/Connection.h b/src/comm/Connection.h
index a9fb15040a18df155bb33846b1030143691d7a13..2743bc595a3cf6b002964749e9315cd033688fce 100644 (file)
--- 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 0314a98fd1c46e61e7930e99cb56b34fe159cc37..e3a8c2653ac82959b91561230e84ea582b6d8feb 100644 (file)
--- 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 06cb349e091df96f3e97809139a78acf0627dc8f..8669822a3b30ebd3b027e7ef065697f0180bbaca 100644 (file)
--- 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 041c1cd5b2199f4e7d9b2e49690c3dff21399815..c7849748ed41fa5a8fab411ed9ce80e4bd716701 100644 (file)
--- 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;