From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sun, 30 Aug 2015 16:56:24 +0000 (+0200)
Subject: Revert enum-related changes
X-Git-Tag: SQUID_4_0_1~81^2~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=757fc1202dd25f9f1e1c61df48fd771ba1736754;p=thirdparty%2Fsquid.git

Revert enum-related changes
---

diff --git a/src/Store.h b/src/Store.h
index 4c953a8d8a..58ca79787c 100644
--- a/src/Store.h
+++ b/src/Store.h
@@ -37,28 +37,6 @@ class StoreClient;
 class StoreSearch;
 class SwapDir;
 
-enum mem_status_t {
-    NOT_IN_MEMORY,
-    IN_MEMORY
-};
-
-enum store_status_t {
-    STORE_OK,
-    STORE_PENDING
-};
-
-enum swap_status_t {
-    SWAPOUT_NONE,
-    SWAPOUT_WRITING,
-    SWAPOUT_DONE
-};
-
-enum store_client_t {
-    STORE_NON_CLIENT,
-    STORE_MEM_CLIENT,
-    STORE_DISK_CLIENT
-};
-
 extern StoreIoStats store_io_stats;
 
 /// maximum number of entries per cache_dir
diff --git a/src/enums.h b/src/enums.h
index ce84ca5281..f70565d050 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -9,6 +9,21 @@
 #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,
@@ -16,12 +31,34 @@ typedef enum {
     PEER_MULTICAST
 } peer_t;
 
+typedef enum _mem_status_t {
+    NOT_IN_MEMORY,
+    IN_MEMORY
+} mem_status_t;
+
 typedef enum {
     PING_NONE,
     PING_WAITING,
     PING_DONE
 } ping_status_t;
 
+typedef enum {
+    STORE_OK,
+    STORE_PENDING
+} store_status_t;
+
+typedef enum {
+    SWAPOUT_NONE,
+    SWAPOUT_WRITING,
+    SWAPOUT_DONE
+} swap_status_t;
+
+typedef enum {
+    STORE_NON_CLIENT,
+    STORE_MEM_CLIENT,
+    STORE_DISK_CLIENT
+} store_client_t;
+
 /*
  * These are for StoreEntry->flag, which is defined as a SHORT
  *
diff --git a/src/fd.h b/src/fd.h
index 168ff84c16..045a6992a1 100644
--- a/src/fd.h
+++ b/src/fd.h
@@ -11,21 +11,6 @@
 #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 *);