From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 28 Aug 2015 20:52:14 +0000 (+0200)
Subject: Moved fd_type, FD_READ, FD_WRITE from enums.h to fd.h
X-Git-Tag: SQUID_4_0_1~81^2~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef8acffaccdece9f52ee35c609115d24fdd46882;p=thirdparty%2Fsquid.git

Moved fd_type, FD_READ, FD_WRITE from enums.h to fd.h
---

diff --git a/src/enums.h b/src/enums.h
index f70565d050..e2affc0e37 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -9,21 +9,6 @@
 #ifndef SQUID_ENUMS_H
 #define SQUID_ENUMS_H
 
-enum fd_type {
-    FD_NONE,
-    FD_LOG,
-    FD_FILE,
-    FD_SOCKET,
-    FD_PIPE,
-    FD_MSGHDR,
-    FD_UNKNOWN
-};
-
-enum {
-    FD_READ,
-    FD_WRITE
-};
-
 typedef enum {
     PEER_NONE,
     PEER_SIBLING,
diff --git a/src/fd.h b/src/fd.h
index 045a6992a1..168ff84c16 100644
--- a/src/fd.h
+++ b/src/fd.h
@@ -11,6 +11,21 @@
 #ifndef SQUID_FD_H_
 #define SQUID_FD_H_
 
+enum fd_type {
+    FD_NONE,
+    FD_LOG,
+    FD_FILE,
+    FD_SOCKET,
+    FD_PIPE,
+    FD_MSGHDR,
+    FD_UNKNOWN
+};
+
+enum {
+    FD_READ,
+    FD_WRITE
+};
+
 void fd_close(int fd);
 void fd_open(int fd, unsigned int type, const char *);
 void fd_note(int fd, const char *);
diff --git a/src/fde.cc b/src/fde.cc
index 497adf44f0..6a7afe3156 100644
--- a/src/fde.cc
+++ b/src/fde.cc
@@ -10,6 +10,7 @@
 
 #include "squid.h"
 #include "comm/Read.h"
+#include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "SquidTime.h"