---------------------
PatchSet 8226 
Date: 2006/06/11 17:08:19
Author: serassio
Branch: nt
Tag: (none) 
Log:
Cosmetic changes to avoid merge conflicts

Members: 
	src/Makefile.am:1.34.2.8->1.34.2.9 
	src/cf.data.pre:1.100.2.17->1.100.2.18 
	src/comm.c:1.29.8.11->1.29.8.12 

Index: squid/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v
retrieving revision 1.34.2.8
retrieving revision 1.34.2.9
diff -u -r1.34.2.8 -r1.34.2.9
--- squid/src/Makefile.am	9 Jun 2006 18:44:00 -0000	1.34.2.8
+++ squid/src/Makefile.am	11 Jun 2006 17:08:19 -0000	1.34.2.9
@@ -77,13 +77,12 @@
 if USE_SELECT
 COMMLOOP_SOURCE = comm_select.c
 endif
-if USE_KQUEUE
-COMMLOOP_SOURCE = comm_kqueue.c
-endif
 if USE_SELECT_WIN32
 COMMLOOP_SOURCE = comm_select_win32.c
 endif
-
+if USE_KQUEUE
+COMMLOOP_SOURCE = comm_kqueue.c
+endif
 
 SUBDIRS		= fs repl auth
 
Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cf.data.pre,v
retrieving revision 1.100.2.17
retrieving revision 1.100.2.18
diff -u -r1.100.2.17 -r1.100.2.18
--- squid/src/cf.data.pre	11 Jun 2006 07:11:24 -0000	1.100.2.17
+++ squid/src/cf.data.pre	11 Jun 2006 17:08:19 -0000	1.100.2.18
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.100.2.17 2006/06/11 07:11:24 serassio Exp $
+# $Id: cf.data.pre,v 1.100.2.18 2006/06/11 17:08:19 serassio Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -2955,7 +2955,6 @@
 NOCOMMENT_END
 DOC_END
 
-
 NAME: htcp_access
 IFDEF: USE_HTCP
 TYPE: acl_access
Index: squid/src/comm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/comm.c,v
retrieving revision 1.29.8.11
retrieving revision 1.29.8.12
diff -u -r1.29.8.11 -r1.29.8.12
--- squid/src/comm.c	9 Jun 2006 18:44:03 -0000	1.29.8.11
+++ squid/src/comm.c	11 Jun 2006 17:08:19 -0000	1.29.8.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.c,v 1.29.8.11 2006/06/09 18:44:03 serassio Exp $
+ * $Id: comm.c,v 1.29.8.12 2006/06/11 17:08:19 serassio Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -219,7 +219,7 @@
 #ifdef _SQUID_MSWIN_
 	if (sock_type != SOCK_DGRAM)
 #endif
-	commSetNoLinger(new_socket);
+	    commSetNoLinger(new_socket);
 	if (opt_reuseaddr)
 	    commSetReuseAddr(new_socket);
     }
@@ -982,8 +982,8 @@
     int nonblocking = FALSE;
     if (ioctlsocket(fd, FIONBIO, (unsigned long *) &nonblocking) < 0) {
 #else
-    int dummy = 0;
     int flags;
+    int dummy = 0;
     if ((flags = fcntl(fd, F_GETFL, dummy)) < 0) {
 	debug(50, 0) ("FD %d: fcntl F_GETFL: %s\n", fd, xstrerror());
 	return COMM_ERROR;