From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 4 Sep 2011 18:51:47 +0000 (-0600)
Subject: Minimize differences with trunk.
X-Git-Tag: take08~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e557e9df40cfaf55f9441d0e4346076c1195ef66;p=thirdparty%2Fsquid.git

Minimize differences with trunk.
---

diff --git a/configure.ac b/configure.ac
index a21ab99686..1df0636f36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2591,7 +2591,6 @@ AC_SEARCH_LIBS([bind],[socket])
 AC_SEARCH_LIBS([opcom_stack_trace],[opcom_stack])
 AC_SEARCH_LIBS([strlcpy], [bsd])
 AC_SEARCH_LIBS([yp_match], [nsl nss_nis nss_nisplus])
-
 dnl Check for Winsock only on MinGW, on Cygwin we must use emulated BSD socket API
 if test "x$squid_host_os" = "xmingw" ; then
   SQUID_CHECK_WINSOCK_LIB
diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc
index 2a62698ce7..d4955ee347 100644
--- a/src/DiskIO/Blocking/BlockingFile.cc
+++ b/src/DiskIO/Blocking/BlockingFile.cc
@@ -217,7 +217,7 @@ void
 BlockingFile::writeDone(int rvfd, int errflag, size_t len)
 {
     assert (rvfd == fd);
-    debugs(79,3, HERE << "FD " << fd << ", len " << len);
+    debugs(79, 3, HERE << "FD " << fd << ", len " << len);
 
     WriteRequest::Pointer result = writeRequest;
     writeRequest = NULL;
diff --git a/src/Makefile.am b/src/Makefile.am
index dcdb6f110a..68fd27fae0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -466,8 +466,10 @@ squid_SOURCES = \
 	Server.h \
 	structs.h \
 	swap_log_op.h \
-	SwapDir.cc MemStore.cc \
-	SwapDir.h MemStore.h \
+	SwapDir.cc \
+	SwapDir.h \
+	MemStore.cc \
+	MemStore.h \
 	time.cc \
 	TimeOrTag.h \
 	tools.cc \
@@ -1356,7 +1358,8 @@ tests_testCacheManager_SOURCES = \
 	StoreSwapLogData.cc \
 	tools.cc \
 	tunnel.cc \
-	SwapDir.cc MemStore.cc \
+	SwapDir.cc \
+	MemStore.cc \
 	$(UNLINKDSOURCE) \
 	url.cc \
 	URLScheme.cc \
@@ -2258,7 +2261,8 @@ tests_testHttpRequest_SOURCES = \
 	event.cc \
 	tools.cc \
 	tunnel.cc \
-	SwapDir.cc MemStore.cc \
+	SwapDir.cc \
+	MemStore.cc \
 	url.cc \
 	URLScheme.cc \
 	urn.cc \
@@ -3098,7 +3102,8 @@ tests_testURL_SOURCES = \
 	StoreMetaVary.cc \
 	StoreSwapLogData.cc \
 	String.cc \
-	SwapDir.cc MemStore.cc \
+	SwapDir.cc \
+	MemStore.cc \
 	tests/stub_debug.cc \
 	tests/stub_DiskIOModule.cc \
 	tests/stub_main_cc.cc \