---------------------
PatchSet 8282 
Date: 2006/06/24 09:33:16
Author: serassio
Branch: nt
Tag: (none) 
Log:
Use PACKAGE_NAME for Windows service name, changed default service name to Squid

Members: 
	src/win32.c:1.7.8.9->1.7.8.10 
	src/fs/.cvsignore:1.3.132.1->1.3.132.2 

Index: squid/src/win32.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/win32.c,v
retrieving revision 1.7.8.9
retrieving revision 1.7.8.10
diff -u -r1.7.8.9 -r1.7.8.10
--- squid/src/win32.c	24 May 2006 21:18:16 -0000	1.7.8.9
+++ squid/src/win32.c	24 Jun 2006 09:33:16 -0000	1.7.8.10
@@ -79,11 +79,7 @@
 static int Squid_Aborting = 0;
 
 #define VENDOR   "GNU"
-#if defined(_SQUID_MSWIN_)
-#define SOFTWARENAME "SquidNT"
-#else
 #define SOFTWARENAME "Squid"
-#endif
 #define WIN32_VERSION  "2.6"
 #define COMMANDLINE "CommandLine"
 #define CONFIGFILE  "ConfigFile"
@@ -98,7 +94,7 @@
 {
     {SC_ACTION_RESTART, 60000}};
 static SERVICE_DESCRIPTION Squid_ServiceDescription =
-{SOFTWARENAME " " VERSION " WWW Proxy Server"};
+{SOFTWARENAME " " VERSION " " PACKAGE_NAME};
 static SERVICE_FAILURE_ACTIONS Squid_ServiceFailureActions =
 {INFINITE, NULL, NULL, 1, Squid_SCAction};
 static char REGKEY[256] = "SOFTWARE\\" VENDOR "\\" SOFTWARENAME "\\" WIN32_VERSION "\\";
Index: squid/src/fs/.cvsignore
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/.cvsignore,v
retrieving revision 1.3.132.1
retrieving revision 1.3.132.2
diff -u -r1.3.132.1 -r1.3.132.2
--- squid/src/fs/.cvsignore	18 Jun 2006 13:35:48 -0000	1.3.132.1
+++ squid/src/fs/.cvsignore	24 Jun 2006 09:33:17 -0000	1.3.132.2
@@ -1,2 +1,3 @@
 Makefile
 Makefile.in
+diskd-daemon