wok annotate commoncpp2/stuff/1.7.3-gcc4.4.diff @ rev 5368
vlc: no need to disable-swscale; compiles with ffmpeg-svn-dev but not with ffmpeg-dev
| author | Rohit Joshi <jozee@slitaz.org> |
|---|---|
| date | Thu Apr 29 07:57:28 2010 -0400 (2010-04-29) |
| parents | |
| children |
| rev | line source |
|---|---|
| rcx@3771 | 1 --- commoncpp2-1.7.3.org/src/cidr.cpp 2009-01-16 07:27:00.000000000 -0500 |
| rcx@3771 | 2 +++ commoncpp2-1.7.3/src/cidr.cpp 2009-07-28 15:29:02.881384386 -0400 |
| rcx@3771 | 3 @@ -199,11 +199,7 @@ void IPV4Cidr::set(const char *cp) |
| rcx@3771 | 4 bitset((bit_t *)&netmask, getMask(cp)); |
| rcx@3771 | 5 setString(cbuf, sizeof(cbuf), cp); |
| rcx@3771 | 6 |
| rcx@3771 | 7 -#if defined(_MSC_VER) && _MSC_VER >= 1500 |
| rcx@3771 | 8 - ep = (char *)strchr(cp, '/'); |
| rcx@3771 | 9 -#else |
| rcx@3771 | 10 - ep = strchr(cp, '/'); |
| rcx@3771 | 11 -#endif |
| rcx@3771 | 12 + ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750 |
| rcx@3771 | 13 |
| rcx@3771 | 14 if(ep) |
| rcx@3771 | 15 *ep = 0; |
| rcx@3771 | 16 @@ -332,7 +328,7 @@ void IPV6Cidr::set(const char *cp) |
| rcx@3771 | 17 memset(&netmask, 0, sizeof(netmask)); |
| rcx@3771 | 18 bitset((bit_t *)&netmask, getMask(cp)); |
| rcx@3771 | 19 setString(cbuf, sizeof(cbuf), cp); |
| rcx@3771 | 20 - ep = strchr(cp, '/'); |
| rcx@3771 | 21 + ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750 |
| rcx@3771 | 22 if(ep) |
| rcx@3771 | 23 *ep = 0; |
| rcx@3771 | 24 |