Renamed squid.h to squid-old.h and config.h to squid.h

[thirdparty/squid.git] / src / fs / Module.cc

diff --git a/src/fs/Module.cc b/src/fs/Module.cc
index 8833a1bbefe213d13cca5e3a9853da55c5d5d573..5c900b5dbf4deff7b99f0637ecf5dfe7e01202d5 100644 (file)
--- a/src/fs/Module.cc
+++ b/src/fs/Module.cc
@@ -1,33 +1,39 @@
-#include "squid.h"
+#include "squid-old.h"
 #include "Module.h"
 #if defined(HAVE_FS_UFS) || defined(HAVE_FS_AUFS) || defined(HAVE_FS_DISKD)
 #include "fs/ufs/StoreFSufs.h"
 #include "fs/ufs/ufscommon.h"
 #endif
 
-#ifdef HAVE_FS_COSS
+#if HAVE_FS_COSS
 #include "fs/coss/StoreFScoss.h"
 #endif
 
-#ifdef HAVE_FS_UFS
+#if HAVE_FS_UFS
 static StoreFSufs<UFSSwapDir> *UfsInstance;
 #endif
 
-#ifdef HAVE_FS_AUFS
+#if HAVE_FS_AUFS
 static StoreFSufs<UFSSwapDir> *AufsInstance;
 #endif
 
 
-#ifdef HAVE_FS_DISKD
+#if HAVE_FS_DISKD
 static StoreFSufs<UFSSwapDir> *DiskdInstance;
 #endif
 
+#if HAVE_FS_ROCK
+#include "fs/rock/RockStoreFileSystem.h"
+static Rock::StoreFileSystem *RockInstance = NULL;
+#endif
+
+
 /* TODO: Modify coss code to:
  * (a) remove the StoreFScoss::GetInstance method,
  * (b) declare the StoreFScoss::stats  as static and
  * (c) merge the StoreFScoss::stat() method with the static
  *     StoreFScoss::Stats() */
-#ifdef HAVE_FS_COSS
+#if HAVE_FS_COSS
 StoreFScoss &CossInstance = StoreFScoss::GetInstance();
 #endif
 
@@ -35,35 +41,43 @@ StoreFScoss &CossInstance = StoreFScoss::GetInstance();
 void Fs::Init()
 {
 
-#ifdef HAVE_FS_UFS
+#if HAVE_FS_UFS
     UfsInstance = new StoreFSufs<UFSSwapDir>("Blocking", "ufs");
 #endif
 
-#ifdef HAVE_FS_AUFS
+#if HAVE_FS_AUFS
     AufsInstance = new StoreFSufs<UFSSwapDir>("DiskThreads", "aufs");;
 #endif
 
 
-#ifdef HAVE_FS_DISKD
+#if HAVE_FS_DISKD
     DiskdInstance = new StoreFSufs<UFSSwapDir>("DiskDaemon", "diskd");;
 #endif
 
+#if HAVE_FS_ROCK
+    RockInstance = new Rock::StoreFileSystem();
+#endif
+
 }
 
 
 void Fs::Clean()
 {
-#ifdef HAVE_FS_UFS
+#if HAVE_FS_UFS
     delete UfsInstance;
 #endif
 
-#ifdef HAVE_FS_AUFS
+#if HAVE_FS_AUFS
     delete AufsInstance;
 #endif
 
 
-#ifdef HAVE_FS_DISKD
+#if HAVE_FS_DISKD
     delete DiskdInstance;
 #endif
 
+#if HAVE_FS_ROCK
+    delete RockInstance;
+#endif
+
 }