From ab4bbe62ce0a8b449be7e6428abf733faed2b1f6 Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Tue, 17 Jan 2012 20:39:17 +0100 Subject: [PATCH] gcc 4.7 patch was only partially upstream. Now committed but not yet in changesets --- squid-3.2.0.14-gcc47.patch | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/squid-3.2.0.14-gcc47.patch b/squid-3.2.0.14-gcc47.patch index 5e9c9f4..e507749 100644 --- a/squid-3.2.0.14-gcc47.patch +++ b/squid-3.2.0.14-gcc47.patch @@ -10,15 +10,3 @@ diff -up squid-3.2.0.14/src/ssl/support.cc.gcc47 squid-3.2.0.14/src/ssl/support. }, #endif #if SSL_OP_SINGLE_DH_USE -diff -up squid-3.2.0.14/src/StoreEntryStream.h.gcc47 squid-3.2.0.14/src/StoreEntryStream.h ---- squid-3.2.0.14/src/StoreEntryStream.h.gcc47 2012-01-13 15:34:52.973978675 +0100 -+++ squid-3.2.0.14/src/StoreEntryStream.h 2012-01-16 08:36:31.504084580 +0100 -@@ -70,7 +70,7 @@ protected: - return traits_type::eof(); - - if (aChar != traits_type::eof()) { -- char chars[1] = {aChar}; -+ char chars[1] = { (char)aChar }; - - if (aChar != traits_type::eof()) - theEntry->append(chars, 1);