Moved sfileno and sdirno from typedefs.h to fs/forward.h

diff --git a/src/FileMap.h b/src/FileMap.h
index 2eb9af5759b41be24e8a94b7c4c8c620d14adceb..57a7bed75a8d14c1ada5f766ea1c5e9112f729fc 100644 (file)
--- a/src/FileMap.h
+++ b/src/FileMap.h
@@ -11,7 +11,7 @@
 #ifndef FILEMAP_H_
 #define FILEMAP_H_
 
-#include "typedefs.h"
+#include "fs/forward.h"
 
 /** A bitmap used for managing UFS StoreEntry "file numbers".
  *

diff --git a/src/StoreIOState.h b/src/StoreIOState.h
index cc16dbc937a811416cfbceeb6b401d88b05c43df..a495bf018bbad51aebbba7940cdce38fe8ea1701 100644 (file)
--- a/src/StoreIOState.h
+++ b/src/StoreIOState.h
@@ -11,6 +11,7 @@
 
 #include "base/RefCount.h"
 #include "cbdata.h"
+#include "fs/forward.h"
 
 class StoreIOState : public RefCountable
 {

diff --git a/src/StoreSwapLogData.h b/src/StoreSwapLogData.h
index bc1b3190b38435dcb480cc0faf3cb246902bafa8..8995bdd9577d21520e929e445a4335df6d826d5e 100644 (file)
--- a/src/StoreSwapLogData.h
+++ b/src/StoreSwapLogData.h
@@ -37,7 +37,7 @@
 
 #include "md5.h"
 #include "mem/forward.h"
-#include "typedefs.h"
+#include "fs/forward.h"
 
 /// maintains a 24-bit checksum over integer fields
 class SwapChecksum24

diff --git a/src/fs/forward.h b/src/fs/forward.h
new file mode 100644 (file)
index 0000000..e8a14d5
--- /dev/null
+++ b/src/fs/forward.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+#ifndef SQUID_FORWARD_H_
+#define SQUID_FORWARD_H_
+
+typedef int32_t sfileno;
+typedef signed int sdirno;
+
+
+#endif /* SQUID_FORWARD_H_ */

diff --git a/src/fs/rock/RockDbCell.h b/src/fs/rock/RockDbCell.h
index be60ecfcfaa82a58f8eec82d7dc4a68477c0b9fe..576eb409b3eec62fafe24ace33820b8fde0cfa00 100644 (file)
--- a/src/fs/rock/RockDbCell.h
+++ b/src/fs/rock/RockDbCell.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_FS_ROCK_DB_CELL_H
 #define SQUID_FS_ROCK_DB_CELL_H
 
-#include "typedefs.h"
+#include "fs/forward.h"
 
 namespace Rock
 {

diff --git a/src/fs/rock/RockForward.h b/src/fs/rock/RockForward.h
index cae7f0344948445ae4d0c9a36ea0801b3474ae9d..eff5e4550cd22b2fd26ca5e89d00e9bf41c77662 100644 (file)
--- a/src/fs/rock/RockForward.h
+++ b/src/fs/rock/RockForward.h
@@ -9,6 +9,8 @@
 #ifndef SQUID_FS_ROCK_FORWARD_H
 #define SQUID_FS_ROCK_FORWARD_H
 
+#include "fs/forward.h"
+
 namespace Ipc
 {
 

diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc
index 60ee1c420b511bfd03582546b64a0aecf48ad1c1..7d1f631bccbeabc32922a58c0c1b1515b6875dd0 100644 (file)
--- a/src/fs/rock/RockRebuild.cc
+++ b/src/fs/rock/RockRebuild.cc
@@ -19,7 +19,7 @@
 #include "SquidTime.h"
 #include "store_rebuild.h"
 #include "tools.h"
-#include "typedefs.h"
+#include "fs/forward.h"
 
 #include <cerrno>
 

diff --git a/src/ipc/MemMap.h b/src/ipc/MemMap.h
index 0c3f1eab1fbb3ea0b1dde2e2cc9350b2fba7aa07..92a361e09a60f4160368468f2bb3ab79675449c9 100644 (file)
--- a/src/ipc/MemMap.h
+++ b/src/ipc/MemMap.h
@@ -15,7 +15,7 @@
 #include "ipc/ReadWriteLock.h"
 #include "SBuf.h"
 #include "tools.h"
-#include "typedefs.h"
+#include "fs/forward.h"
 
 #include <atomic>
 

diff --git a/src/ipc/StoreMap.h b/src/ipc/StoreMap.h
index a3ec8b1736c68bb7a5bb527d72ecbdd266f04e35..2073a8f8883616ea79b22a1877744c065fcf3227 100644 (file)
--- a/src/ipc/StoreMap.h
+++ b/src/ipc/StoreMap.h
@@ -13,7 +13,7 @@
 #include "ipc/mem/Pointer.h"
 #include "ipc/ReadWriteLock.h"
 #include "SBuf.h"
-#include "typedefs.h"
+#include "fs/forward.h"
 
 namespace Ipc
 {

diff --git a/src/typedefs.h b/src/typedefs.h
index 7a31514dd8ff535079e31c666f3f7280af8b74fb..041c1cd5b2199f4e7d9b2e49690c3dff21399815 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -11,9 +11,6 @@
 #ifndef SQUID_TYPEDEFS_H
 #define SQUID_TYPEDEFS_H
 
-typedef int32_t sfileno;
-typedef signed int sdirno;
-
 typedef uint32_t nfmark_t;
 typedef unsigned char tos_t;