From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 19 Dec 2014 07:05:13 +0000 (-0800)
Subject: Windows: fix GCC 4.9 build issue in --enable-win32-service
X-Git-Tag: merge-candidate-3-v1~428
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d54b51739879d5af9a909d682d44f3267bce002a;p=thirdparty%2Fsquid.git

Windows: fix GCC 4.9 build issue in --enable-win32-service
---

diff --git a/src/WinSvc.cc b/src/WinSvc.cc
index a98481bb1b..7495078c89 100644
--- a/src/WinSvc.cc
+++ b/src/WinSvc.cc
@@ -80,7 +80,7 @@ static SC_ACTION Squid_SCAction[] = { { SC_ACTION_RESTART, 60000 } };
 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"\\";
+static char REGKEY[256] = SOFTWARE "\\" VENDOR "\\" SOFTWARENAME "\\";
 static char *keys[] = {
     SOFTWAREString,	    /* key[0] */
     VENDORString,	    /* key[1] */