---------------------
PatchSet 6678 
Date: 2005/05/20 08:41:50
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
- Fixed a merge error
- STABLE10-NT release

Members: 
	configure.in:1.42.2.5.4.71->1.42.2.5.4.72 
	doc/Makefile.am:1.1.2.1.4.5->1.1.2.1.4.6 
	src/fs/aufs/store_dir_aufs.c:1.23.6.1.4.15->1.23.6.1.4.16 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.42.2.5.4.71
retrieving revision 1.42.2.5.4.72
diff -u -r1.42.2.5.4.71 -r1.42.2.5.4.72
--- squid/configure.in	20 May 2005 08:18:31 -0000	1.42.2.5.4.71
+++ squid/configure.in	20 May 2005 08:41:50 -0000	1.42.2.5.4.72
@@ -3,15 +3,15 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.42.2.5.4.71 2005/05/20 08:18:31 serassio Exp $
+dnl  $Id: configure.in,v 1.42.2.5.4.72 2005/05/20 08:41:50 serassio Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(cfgaux)
-AM_INIT_AUTOMAKE(squid, 2.5.STABLE10-CVS)
+AM_INIT_AUTOMAKE(squid, 2.5.STABLE10-NT-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.42.2.5.4.71 $)dnl
+AC_REVISION($Revision: 1.42.2.5.4.72 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
Index: squid/doc/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/doc/Makefile.am,v
retrieving revision 1.1.2.1.4.5
retrieving revision 1.1.2.1.4.6
diff -u -r1.1.2.1.4.5 -r1.1.2.1.4.6
--- squid/doc/Makefile.am	13 May 2005 14:24:05 -0000	1.1.2.1.4.5
+++ squid/doc/Makefile.am	20 May 2005 08:41:50 -0000	1.1.2.1.4.6
@@ -37,3 +37,4 @@
 
 CLEANFILES = \
 	squid.8 \
+	cachemgr.cgi.8
Index: squid/src/fs/aufs/store_dir_aufs.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/aufs/store_dir_aufs.c,v
retrieving revision 1.23.6.1.4.15
retrieving revision 1.23.6.1.4.16
diff -u -r1.23.6.1.4.15 -r1.23.6.1.4.16
--- squid/src/fs/aufs/store_dir_aufs.c	27 Mar 2005 07:51:24 -0000	1.23.6.1.4.15
+++ squid/src/fs/aufs/store_dir_aufs.c	20 May 2005 08:41:51 -0000	1.23.6.1.4.16
@@ -1175,7 +1175,7 @@
 	debug(50, 0) ("%s: %s\n", swaplog_path, xstrerror());
 	fatal("Failed to open swap log for reading");
     }
-#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
+#if defined(_SQUID_CYGWIN_)
     setmode(fileno(fp), O_BINARY);
 #endif
     memset(&clean_sb, '\0', sizeof(struct stat));