Revert enum-related changes

diff --git a/src/Store.h b/src/Store.h
index 4c953a8d8ab92e3c3efad7ddea095769ad184f36..58ca79787c89ad18533c689e28ea8f0253bd3b43 100644 (file)
--- 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 ce84ca528125c1205f1cc1e9485b0f835eca04e6..f70565d0505e849ce4ea6859c736713fda56a52b 100644 (file)
--- 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 168ff84c168b6a190141c19d9645e8de684da114..045a6992a153bf77f084a2bc57c673537bc6c62b 100644 (file)
--- 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 *);