---------------------
PatchSet 4005 
Date: 2002/04/13 18:40:08
Author: serassio
Branch: cygwin
Tag: (none) 
Log:
Some WIN32 code cleanup

Members: 
	doc/win32-relnotes.txt:1.1.2.2->1.1.2.3 
	include/config.h:1.2.2.5->1.2.2.6 
	src/.cvsignore:1.3.12.1->1.3.12.2 
	src/debug.c:1.3.26.13->1.3.26.14 
	src/fs/aufs/store_dir_aufs.c:1.6.10.11->1.6.10.12 

Index: squid/doc/win32-relnotes.txt
===================================================================
RCS file: /cvsroot/squid-sf//squid/doc/Attic/win32-relnotes.txt,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- squid/doc/win32-relnotes.txt	2 Jun 2001 09:48:23 -0000	1.1.2.2
+++ squid/doc/win32-relnotes.txt	13 Apr 2002 18:40:08 -0000	1.1.2.3
@@ -14,6 +14,8 @@
 aware of this, and try to use it only on the rigth platform.
 On Windows NT PSAPI.DLL can be found as component of many applications, if you need it,
 you can find it on Windows NT Resource KIT. If you have problem, you can You can 
-download it here: http://www.serassio.it/download/psapi.zip
+download it here: 
+http://download.microsoft.com/download/platformsdk/Redist/4.0.1371.1/NT4/EN-US/psinst.EXE
+
 On Windows 2000 it is available installing the Windows 2000 Support Tools, located on the
 Support\Tools folder of the installation Windows 2000 CD-ROM.
Index: squid/include/config.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/config.h,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- squid/include/config.h	20 Nov 2001 21:10:30 -0000	1.2.2.5
+++ squid/include/config.h	13 Apr 2002 18:40:08 -0000	1.2.2.6
@@ -105,7 +105,7 @@
 #define _SQUID_CYGWIN_
 
 #elif defined(WIN32) || defined(WINNT) || defined(__WIN32__) || defined(__WIN32)
-#define _SQUID_MSWIN_			      /* MS Compilers */
+#define _SQUID_MSWIN_
 
 #elif defined(__APPLE__)
 #define _SQUID_APPLE_
Index: squid/src/.cvsignore
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/.cvsignore,v
retrieving revision 1.3.12.1
retrieving revision 1.3.12.2
diff -u -r1.3.12.1 -r1.3.12.2
--- squid/src/.cvsignore	19 Oct 2001 19:05:09 -0000	1.3.12.1
+++ squid/src/.cvsignore	13 Apr 2002 18:40:08 -0000	1.3.12.2
@@ -1,5 +1,2 @@
 .cvsignore
 Makefile.in
-cache_manager-reconfigure.c
-service
-dns
Index: squid/src/debug.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/debug.c,v
retrieving revision 1.3.26.13
retrieving revision 1.3.26.14
diff -u -r1.3.26.13 -r1.3.26.14
--- squid/src/debug.c	28 Dec 2001 15:42:35 -0000	1.3.26.13
+++ squid/src/debug.c	13 Apr 2002 18:40:08 -0000	1.3.26.14
@@ -1,6 +1,6 @@
 
 /*
- * $Id: debug.c,v 1.3.26.13 2001/12/28 15:42:35 serassio Exp $
+ * $Id: debug.c,v 1.3.26.14 2002/04/13 18:40:08 serassio Exp $
  *
  * DEBUG: section 0     Debug Routines
  * AUTHOR: Harvest Derived
@@ -67,7 +67,7 @@
     /* give a chance to context-based debugging to print current context */
     if (!Ctx_Lock)
 	ctx_print();
-#if STDC_HEADERS    
+#if STDC_HEADERS
     va_start(args1, format);
     va_start(args2, format);
     va_start(args3, format);
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.6.10.11
retrieving revision 1.6.10.12
diff -u -r1.6.10.11 -r1.6.10.12
--- squid/src/fs/aufs/store_dir_aufs.c	16 Mar 2002 10:38:33 -0000	1.6.10.11
+++ squid/src/fs/aufs/store_dir_aufs.c	13 Apr 2002 18:40:08 -0000	1.6.10.12
@@ -862,7 +862,7 @@
     char *new_path = xstrdup(storeAufsDirSwapLogFile(sd, ".new"));
     int fd;
     file_close(aioinfo->swaplog_fd);
-#if defined(_SQUID_OS2_) || defined (_SQUID_CYGWIN_) || defined(_SQUID_MSWIN_)
+#if defined (_SQUID_OS2_) || defined (_SQUID_CYGWIN_)
     if (unlink(swaplog_path) < 0) {
 	debug(50, 0) ("%s: %s\n", swaplog_path, xstrerror());
 	fatal("storeAufsDirCloseTmpSwapLog: unlink failed");
@@ -917,7 +917,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_)
+#ifdef _SQUID_CYGWIN_
     setmode(fileno(fp), O_BINARY);
 #endif
     memset(&clean_sb, '\0', sizeof(struct stat));
@@ -1062,7 +1062,7 @@
     fd = state->fd;
     /* rename */
     if (state->fd >= 0) {
-#if defined(_SQUID_OS2_) || defined (_SQUID_CYGWIN_) || defined(_SQUID_MSWIN_)
+#if defined(_SQUID_OS2_) || defined (_SQUID_CYGWIN_)
 	file_close(state->fd);
 	state->fd = -1;
 	if (unlink(state->cur) < 0)