gcc 4.7 patch was only partially upstream. Now committed but not yet in changesets
This commit is contained in:
parent
c0a1e8da81
commit
ab4bbe62ce
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user