From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sun, 9 Sep 2012 19:41:47 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: sourceformat-review-1~6^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fa037d1fbf44572c2459690c02e1fe7bf1ed2c0;p=thirdparty%2Fsquid.git

Merged from trunk
---

2fa037d1fbf44572c2459690c02e1fe7bf1ed2c0
diff --cc src/cache_manager.cc
index 39fa19917d,dbb961b7cc..5322d2ae85
--- a/src/cache_manager.cc
+++ b/src/cache_manager.cc
@@@ -47,9 -47,8 +47,9 @@@
  #include "mgr/Forwarder.h"
  #include "mgr/FunAction.h"
  #include "mgr/QueryParams.h"
- #include "protos.h" /* rotate_logs() */
+ #include "protos.h"
  #include "tools.h"
 +#include "SquidConfig.h"
  #include "SquidTime.h"
  #include "Store.h"
  #include "wordlist.h"
diff --cc src/ssl/support.cc
index fc25588c9f,aaaa63a5c9..8cc8b63475
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@@ -39,9 -39,9 +39,10 @@@
  #if USE_SSL
  
  #include "acl/FilledChecklist.h"
+ #include "anyp/PortCfg.h"
  #include "fde.h"
  #include "globals.h"
 +#include "SquidConfig.h"
  #include "ssl/ErrorDetail.h"
  #include "ssl/support.h"
  #include "ssl/gadgets.h"
diff --cc src/store_rebuild.h
index ae8947a6d3,64998dbcdb..601b06c373
--- a/src/store_rebuild.h
+++ b/src/store_rebuild.h
@@@ -50,12 -37,10 +50,10 @@@ extern void storeRebuildComplete(StoreR
  extern void storeRebuildProgress(int sd_index, int total, int sofar);
  
  /// loads entry from disk; fills supplied memory buffer on success
 -extern bool storeRebuildLoadEntry(int fd, int diskIndex, MemBuf &buf, struct _store_rebuild_data &counts);
 +extern bool storeRebuildLoadEntry(int fd, int diskIndex, MemBuf &buf, StoreRebuildData &counts);
  /// parses entry buffer and validates entry metadata; fills e on success
 -extern bool storeRebuildParseEntry(MemBuf &buf, StoreEntry &e, cache_key *key, struct _store_rebuild_data &counts, uint64_t expectedSize);
 +extern bool storeRebuildParseEntry(MemBuf &buf, StoreEntry &e, cache_key *key, StoreRebuildData &counts, uint64_t expectedSize);
  /// checks whether the loaded entry should be kept; updates counters
 -extern bool storeRebuildKeepEntry(const StoreEntry &e, const cache_key *key, struct _store_rebuild_data &counts);
 +extern bool storeRebuildKeepEntry(const StoreEntry &e, const cache_key *key, StoreRebuildData &counts);
  
- 
- 
  #endif /* SQUID_STORE_REBUILD_H_ */