[squid] gcc 4.7 patch was only partially upstream. Now committed but not yet in changesets
Henrik Nordström
hno at fedoraproject.org
Tue Jan 17 19:39:50 UTC 2012
commit ab4bbe62ce0a8b449be7e6428abf733faed2b1f6
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date: Tue Jan 17 20:39:17 2012 +0100
gcc 4.7 patch was only partially upstream. Now committed but not yet in changesets
squid-3.2.0.14-gcc47.patch | 12 ------------
1 files changed, 0 insertions(+), 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);
More information about the scm-commits
mailing list