Allow the build with --enable-icmp and --enable-htcp configure options.

diff --git a/src/neighbors.cc b/src/neighbors.cc
index e257ceaf37cc7a9e202290cae90f3f69a9a726aa..ceee7f98fa0f82f865dc2b2db8e492ba200cb2e1 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.cc,v 1.326 2005/01/03 16:08:26 robertc Exp $
+ * $Id: neighbors.cc,v 1.327 2005/01/05 21:59:34 serassio Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -1764,14 +1764,14 @@ void
 
 neighborsHtcpReply(const cache_key * key, htcpReplyData * htcp, const struct sockaddr_in *from)
 {
-    StoreEntry *e = storeGet(key);
+    StoreEntry *e = Store::Root().get(key);
     MemObject *mem = NULL;
     peer *p;
     peer_t ntype = PEER_NONE;
     debug(15, 6) ("neighborsHtcpReply: %s %s\n",
                   htcp->hit ? "HIT" : "MISS", storeKeyText(key));
 
-    if (NULL != (e = storeGet(key)))
+    if (NULL != (e = Store::Root().get(key)))
         mem = e->mem_obj;
 
     if ((p = whichPeer(from)))

diff --git a/src/net_db.cc b/src/net_db.cc
index 74a6d86f09533a028963c83740c07454695e7137..c916224d1dc24f3146542ef68435bceb75a4417f 100644 (file)
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: net_db.cc,v 1.174 2005/01/03 16:08:26 robertc Exp $
+ * $Id: net_db.cc,v 1.175 2005/01/05 21:59:34 serassio Exp $
  *
  * DEBUG: section 38    Network Measurement Database
  * AUTHOR: Duane Wessels
@@ -43,6 +43,7 @@
 
 #include "squid.h"
 #include "Store.h"
+#include "SwapDir.h"
 #include "HttpRequest.h"
 #include "HttpReply.h"
 #include "MemObject.h"
@@ -452,7 +453,7 @@ netdbPath(char *path)
      * separately from the cache dirs, and also be settable in 
      * squid.conf RBC 20041225
      */
-    snprintf(path, SQUID_MAXPATHLEN, "%s/netdb_state", Config.cacheSwap.swapDirs[0]->path);
+    snprintf(path, SQUID_MAXPATHLEN, "%s/netdb_state", dynamic_cast<SwapDir *>(Config.cacheSwap.swapDirs[0].getRaw())->path);
 }
 
 static void