From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 28 Aug 2015 22:28:04 +0000 (+0200)
Subject: Moved mem_status_t and store_status_t to Store.h
X-Git-Tag: SQUID_4_0_1~81^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f495266afc97b2ebdc8610fccacb2d58ca598503;p=thirdparty%2Fsquid.git

Moved mem_status_t and store_status_t to Store.h
---

f495266afc97b2ebdc8610fccacb2d58ca598503
diff --cc src/Store.h
index 28e528bb93,58ca79787c..cbd1bc7fc1
--- a/src/Store.h
+++ b/src/Store.h
@@@ -36,6 -37,6 +37,22 @@@ 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
++};
++
  extern StoreIoStats store_io_stats;
  
  /// maximum number of entries per cache_dir
diff --cc src/enums.h
index f70565d050,e2affc0e37..a3c9f964c0
--- a/src/enums.h
+++ b/src/enums.h
@@@ -31,28 -16,28 +16,12 @@@ 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,