wok-4.x view commoncpp2/stuff/1.7.3-gcc4.4.diff @ rev 5699
Up: usbutils* (0.86)
| author | Eric Joseph-Alexandre <erjo@slitaz.org> |
|---|---|
| date | Fri Jun 18 16:12:50 2010 +0200 (2010-06-18) |
| parents | |
| children |
line source
1 --- commoncpp2-1.7.3.org/src/cidr.cpp 2009-01-16 07:27:00.000000000 -0500
2 +++ commoncpp2-1.7.3/src/cidr.cpp 2009-07-28 15:29:02.881384386 -0400
3 @@ -199,11 +199,7 @@ void IPV4Cidr::set(const char *cp)
4 bitset((bit_t *)&netmask, getMask(cp));
5 setString(cbuf, sizeof(cbuf), cp);
7 -#if defined(_MSC_VER) && _MSC_VER >= 1500
8 - ep = (char *)strchr(cp, '/');
9 -#else
10 - ep = strchr(cp, '/');
11 -#endif
12 + ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750
14 if(ep)
15 *ep = 0;
16 @@ -332,7 +328,7 @@ void IPV6Cidr::set(const char *cp)
17 memset(&netmask, 0, sizeof(netmask));
18 bitset((bit_t *)&netmask, getMask(cp));
19 setString(cbuf, sizeof(cbuf), cp);
20 - ep = strchr(cp, '/');
21 + ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750
22 if(ep)
23 *ep = 0;