diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2009-04-25 11:42:36 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2009-04-25 11:42:36 +0000 |
| commit | 6d1548ad43b507aa28683f5e4db37c0fa0ab0d82 (patch) | |
| tree | 672dc976c0f31e1a80a019c55a81431ed3f77082 /net-proxy/squid/files/squid-3.0.14-gcc43.patch | |
| parent | Bump to newer beta release, this also fixes the gconf-check, see bug (diff) | |
| download | gentoo-2-6d1548ad43b507aa28683f5e4db37c0fa0ab0d82.tar.gz gentoo-2-6d1548ad43b507aa28683f5e4db37c0fa0ab0d82.tar.bz2 gentoo-2-6d1548ad43b507aa28683f5e4db37c0fa0ab0d82.zip | |
Fix assertion failure (#267109). Fix gcc-4.3 and cross compilation issues (#266581).
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'net-proxy/squid/files/squid-3.0.14-gcc43.patch')
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.14-gcc43.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/net-proxy/squid/files/squid-3.0.14-gcc43.patch b/net-proxy/squid/files/squid-3.0.14-gcc43.patch new file mode 100644 index 000000000000..cc2a843201c5 --- /dev/null +++ b/net-proxy/squid/files/squid-3.0.14-gcc43.patch @@ -0,0 +1,39 @@ +diff -Nru squid-3.0.STABLE14.orig/lib/util.c squid-3.0.STABLE14/lib/util.c +--- squid-3.0.STABLE14.orig/lib/util.c 2009-04-11 08:35:38.000000000 +0000 ++++ squid-3.0.STABLE14/lib/util.c 2009-04-25 11:28:40.000000000 +0000 +@@ -755,7 +755,7 @@ + + PROF_stop(xstrdup); + +- return p; ++ return (char *)p; + } + + /* +@@ -765,7 +765,7 @@ + xstrndup(const char *s, size_t n) + { + size_t sz; +- void *p; ++ char *p; + PROF_start(xstrndup); + assert(s != NULL); + assert(n); +@@ -774,7 +774,7 @@ + if (sz > n) + sz = n; + +- p = xstrncpy(xmalloc(sz), s, sz); ++ p = xstrncpy((char *)xmalloc(sz), s, sz); + + PROF_stop(xstrndup); + +@@ -923,7 +923,7 @@ + xint64toa(int64_t num) + { + static char buf[24]; /* 2^64 = 18446744073709551616 */ +- snprintf(buf, sizeof(buf), "%" PRId64, num); ++ snprintf(buf, sizeof(buf), "%" PRId64, (long long int)num); + return buf; + } + |