From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 28 Aug 2015 12:28:07 +0000 (+0200)
Subject: Moved sfileno and sdirno from typedefs.h to fs/forward.h
X-Git-Tag: SQUID_4_0_1~81^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09decbb36a634fdcbc76f1bedf8c22b4511eb4c6;p=thirdparty%2Fsquid.git

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

diff --git a/src/FileMap.h b/src/FileMap.h
index 2eb9af5759..57a7bed75a 100644
--- 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 cc16dbc937..a495bf018b 100644
--- 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 bc1b3190b3..8995bdd957 100644
--- 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
index 0000000000..e8a14d5865
--- /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 be60ecfcfa..576eb409b3 100644
--- 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 cae7f03449..eff5e4550c 100644
--- 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 60ee1c420b..7d1f631bcc 100644
--- 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 0c3f1eab1f..92a361e09a 100644
--- 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 a3ec8b1736..2073a8f888 100644
--- 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 7a31514dd8..041c1cd5b2 100644
--- 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;