| 1 |
patrick 09/06/28 08:58:11 |
| 2 |
|
| 3 |
Added: wvstreams-4.5-glibc.patch |
| 4 |
Log: |
| 5 |
Adding glibc 2.10 compile fix. Closes #273999 |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-libs/wvstreams/files/wvstreams-4.5-glibc.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.5-glibc.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.5-glibc.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: wvstreams-4.5-glibc.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nurp wvstreams-4.5.orig/ipstreams/wvaddr.cc wvstreams-4.5/ipstreams/wvaddr.cc |
| 17 |
--- wvstreams-4.5.orig/ipstreams/wvaddr.cc 2008-07-14 21:11:35.000000000 +0200 |
| 18 |
+++ wvstreams-4.5/ipstreams/wvaddr.cc 2009-06-19 16:39:37.757382441 +0200 |
| 19 |
@@ -538,7 +538,7 @@ WvIPNet::WvIPNet(const WvIPNet &_net) |
| 20 |
// If the netmask is not specified, it will default to all 1's. |
| 21 |
void WvIPNet::string_init(const char string[]) |
| 22 |
{ |
| 23 |
- char *maskptr; |
| 24 |
+ const char *maskptr; |
| 25 |
int bits; |
| 26 |
uint32_t imask; |
| 27 |
|
| 28 |
diff -Nurp wvstreams-4.5.orig/utils/strutils.cc wvstreams-4.5/utils/strutils.cc |
| 29 |
--- wvstreams-4.5.orig/utils/strutils.cc 2008-10-21 21:39:21.000000000 +0200 |
| 30 |
+++ wvstreams-4.5/utils/strutils.cc 2009-06-19 16:36:48.959741828 +0200 |
| 31 |
@@ -315,7 +315,7 @@ WvString url_decode(WvStringParm str, bo |
| 32 |
|
| 33 |
const char *iptr; |
| 34 |
char *optr; |
| 35 |
- char *idx1, *idx2; |
| 36 |
+ const char *idx1, *idx2; |
| 37 |
static const char hex[] = "0123456789ABCDEF"; |
| 38 |
WvString in, intmp(str), out; |
| 39 |
|
| 40 |
@@ -967,7 +967,7 @@ WvString afterstr(WvStringParm line, WvS |
| 41 |
if (!line || !a) |
| 42 |
return WvString::null; |
| 43 |
|
| 44 |
- char *loc = strstr(line, a); |
| 45 |
+ const char *loc = strstr(line, a); |
| 46 |
if (loc == 0) |
| 47 |
return ""; |
| 48 |
|
| 49 |
@@ -984,8 +984,8 @@ WvString beforestr(WvStringParm line, Wv |
| 50 |
return WvString::null; |
| 51 |
|
| 52 |
WvString ret = line; |
| 53 |
- ret.unique(); |
| 54 |
- char *loc = strstr(ret, a); |
| 55 |
+ ret.unique(); |
| 56 |
+ char *loc = strstr(ret.edit(), a); |
| 57 |
|
| 58 |
if (loc == 0) |
| 59 |
return line; |
| 60 |
diff -Nurp wvstreams-4.5.orig/utils/verstring.cc wvstreams-4.5/utils/verstring.cc |
| 61 |
--- wvstreams-4.5.orig/utils/verstring.cc 2008-07-14 21:11:35.000000000 +0200 |
| 62 |
+++ wvstreams-4.5/utils/verstring.cc 2009-06-19 16:37:02.021698602 +0200 |
| 63 |
@@ -147,7 +147,7 @@ bool is_new_ver(unsigned int ver) |
| 64 |
|
| 65 |
bool is_new_verstr(const char *str) |
| 66 |
{ |
| 67 |
- char *p = strchr(str, '.'); |
| 68 |
+ const char *p = strchr(str, '.'); |
| 69 |
if (p && strchr(p+1, '.')) |
| 70 |
return true; |
Archives