------------------------------------------------------------
revno: 13697
revision-id: squid3@treenet.co.nz-20141220154801-9d5glea7sjcn394q
parent: squid3@treenet.co.nz-20141220153809-5ip8gdd8hotpqrb8
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Sat 2014-12-20 07:48:01 -0800
message:
  Windows: fix GCC 4.9 build issue in --enable-win32-service
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141220154801-9d5glea7sjcn394q
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: d8353d4d864d37da9c8953e5e9ba89564c00f28c
# timestamp: 2014-12-20 15:50:54 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20141220153809-\
#   5ip8gdd8hotpqrb8
# 
# Begin patch
=== modified file 'src/WinSvc.cc'
--- src/WinSvc.cc	2014-10-03 13:34:52 +0000
+++ src/WinSvc.cc	2014-12-20 15:48:01 +0000
@@ -80,7 +80,7 @@
 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] */