--------------------- PatchSet 3983 Date: 2002/04/11 20:28:09 Author: serassio Branch: cygwin-svc-2_5 Tag: (none) Log: WIN32 code cleanup Members: doc/win32-relnotes.txt:1.1.34.1->1.1.34.2 src/defines.h:1.15.8.1->1.15.8.2 src/icmp.c:1.4->1.4.70.1 Index: squid/doc/win32-relnotes.txt =================================================================== RCS file: /cvsroot/squid-sf//squid/doc/Attic/win32-relnotes.txt,v retrieving revision 1.1.34.1 retrieving revision 1.1.34.2 diff -u -r1.1.34.1 -r1.1.34.2 --- squid/doc/win32-relnotes.txt 23 Mar 2002 16:27:29 -0000 1.1.34.1 +++ squid/doc/win32-relnotes.txt 11 Apr 2002 20:28:09 -0000 1.1.34.2 @@ -22,7 +22,8 @@ Service uninstallation is made with -r command line switch plus the appropriate -n switch. -The -k switch family must be used with the appropriate -f and -n switches, so the syntax is: +The -k switch family must be used in conjunction with the appropriate -f and -n switches, +so the syntax is: squid -k command [-f file] -n service-name @@ -52,6 +53,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/src/defines.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/defines.h,v retrieving revision 1.15.8.1 retrieving revision 1.15.8.2 diff -u -r1.15.8.1 -r1.15.8.2 --- squid/src/defines.h 27 Feb 2002 19:44:05 -0000 1.15.8.1 +++ squid/src/defines.h 11 Apr 2002 20:28:09 -0000 1.15.8.2 @@ -1,6 +1,6 @@ /* - * $Id: defines.h,v 1.15.8.1 2002/02/27 19:44:05 serassio Exp $ + * $Id: defines.h,v 1.15.8.2 2002/04/11 20:28:09 serassio Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -298,8 +298,6 @@ /* CygWin & Windows NT Port */ #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) -#define _WIN_HOSTS_FILENAME "\\hosts" -#define _WIN95_NETWORK_DB_HOSTS "%WINDIR%" #define _WIN_SQUID_SERVICE_CONTROL_STOP SERVICE_CONTROL_STOP #define _WIN_SQUID_SERVICE_CONTROL_SHUTDOWN SERVICE_CONTROL_SHUTDOWN #define _WIN_SQUID_SERVICE_CONTROL_INTERROGATE SERVICE_CONTROL_INTERROGATE Index: squid/src/icmp.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/icmp.c,v retrieving revision 1.4 retrieving revision 1.4.70.1 diff -u -r1.4 -r1.4.70.1 --- squid/src/icmp.c 12 Jan 2001 08:20:33 -0000 1.4 +++ squid/src/icmp.c 11 Apr 2002 20:28:09 -0000 1.4.70.1 @@ -1,6 +1,6 @@ /* - * $Id: icmp.c,v 1.4 2001/01/12 08:20:33 hno Exp $ + * $Id: icmp.c,v 1.4.70.1 2002/04/11 20:28:09 serassio Exp $ * * DEBUG: section 37 ICMP Routines * AUTHOR: Duane Wessels @@ -190,7 +190,7 @@ icmpOpen(void) { #if USE_ICMP - char *args[2]; + const char *args[2]; int x; int rfd; int wfd;