---------------------
PatchSet 661 
Date: 2003/03/15 10:35:41
Author: serassio
Branch: nt
Tag: (none) 
Log:
made gcc happy

Members: 
	src/win32.cc:1.4.2.2->1.4.2.3 

Index: squid3/src/win32.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/win32.cc,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- squid3/src/win32.cc	2 Mar 2003 10:56:36 -0000	1.4.2.2
+++ squid3/src/win32.cc	15 Mar 2003 10:35:41 -0000	1.4.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: win32.cc,v 1.4.2.2 2003/03/02 10:56:36 serassio Exp $
+ * $Id: win32.cc,v 1.4.2.3 2003/03/15 10:35:41 serassio Exp $
  *
  * * * * * * * * Legal stuff * * * * * * *
  *
@@ -42,7 +42,7 @@
 
 /* This code compiles only CygWin & Windows NT Port */
 #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
-#include <windows.h>
+#include "squid_windows.h"
 #ifdef _SQUID_MSWIN_
 #if HAVE_WIN32_PSAPI
 #include <psapi.h>
@@ -77,13 +77,18 @@
 #endif
 static int Squid_Aborting = 0;
 
-#define VENDOR   "GNU"
+#define VENDOR "GNU"
+static char VENDORString[] = VENDOR;
 #if defined(_SQUID_MSWIN_)
 #define SOFTWARENAME "SquidNT"
 #else
 #define SOFTWARENAME "Squid"
 #endif
-#define WIN32_VERSION  "3.0"
+static char SOFTWARENAMEString[] = SOFTWARENAME;
+#define WIN32_VERSION "3.0"
+static char WIN32_VERSIONString[] = WIN32_VERSION;
+#define SOFTWARE "SOFTWARE"
+static char SOFTWAREString[] = SOFTWARE;
 #define COMMANDLINE "CommandLine"
 #define CONFIGFILE  "ConfigFile"
 #undef ChangeServiceConfig2
@@ -95,14 +100,15 @@
 #endif
 #ifdef USE_WIN32_SERVICE
 static SC_ACTION Squid_SCAction[] = { { SC_ACTION_RESTART, 60000 } };
-static SERVICE_DESCRIPTION Squid_ServiceDescription = { SOFTWARENAME " " VERSION " WWW Proxy Server" };
+static char Squid_ServiceDescriptionString[] = SOFTWARENAME " " VERSION " WWW Proxy Server";
+static SERVICE_DESCRIPTION Squid_ServiceDescription = { Squid_ServiceDescriptionString };
 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"\\"WIN32_VERSION"\\";
 static char *keys[] = {
-                          "SOFTWARE",	    /* key[0] */
-                          VENDOR,	    /* key[1] */
-                          SOFTWARENAME,   /* key[2] */
-                          WIN32_VERSION,  /* key[3] */
+                          SOFTWAREString,	    /* key[0] */
+                          VENDORString,	    /* key[1] */
+                          SOFTWARENAMEString,   /* key[2] */
+                          WIN32_VERSIONString,  /* key[3] */
                           NULL,	    /* key[4] */
                           NULL	    /* key[5] */
                       };
@@ -423,6 +429,8 @@
 
 #ifdef USE_WIN32_SERVICE
 
+
+
     if (WIN32_run_mode == _WIN_SQUID_RUN_MODE_SERVICE)
     {
         char path[512];