---------------------
PatchSet 10779 
Date: 2009/03/29 09:01:22
Author: serassio
Branch: nt
Tag: (none) 
Log:
Modified registry key tree

Members: 
	src/win32.c:1.7.8.28->1.7.8.29 

Index: squid/src/win32.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/win32.c,v
retrieving revision 1.7.8.28
retrieving revision 1.7.8.29
diff -u -r1.7.8.28 -r1.7.8.29
--- squid/src/win32.c	30 Jun 2008 20:59:00 -0000	1.7.8.28
+++ squid/src/win32.c	29 Mar 2009 09:01:22 -0000	1.7.8.29
@@ -80,9 +80,8 @@
 #endif /* USE_WIN32_SERVICE */
 static int Squid_Aborting = 0;
 
-#define VENDOR   "GNU"
-#define SOFTWARENAME "Squid"
-#define WIN32_VERSION  "2.6"
+#define VENDOR   "squid-cache.org"
+#define SOFTWARENAME PACKAGE_NAME
 #define COMMANDLINE "CommandLine"
 #define CONFIGFILE  "ConfigFile"
 #undef ChangeServiceConfig2
@@ -104,13 +103,12 @@
 static SERVICE_FAILURE_ACTIONS Squid_ServiceFailureActions =
 {INFINITE, NULL, NULL, 1, Squid_SCAction};
 
-static char REGKEY[256] = "SOFTWARE\\" VENDOR "\\" SOFTWARENAME "\\" WIN32_VERSION "\\";
+static char REGKEY[256] = "SOFTWARE\\" VENDOR "\\" SOFTWARENAME "\\";
 static char *keys[] =
 {
     "SOFTWARE",			/* key[0] */
     VENDOR,			/* key[1] */
     SOFTWARENAME,		/* key[2] */
-    WIN32_VERSION,		/* key[3] */
     NULL,			/* key[4] */
     NULL			/* key[5] */
 };