SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/commoncpp2/stuff/1.7.3-gcc4.4.diff	Sat Aug 14 15:54:56 2010 +0000
     1.3 @@ -0,0 +1,24 @@
     1.4 +--- commoncpp2-1.7.3.org/src/cidr.cpp	2009-01-16 07:27:00.000000000 -0500
     1.5 ++++ commoncpp2-1.7.3/src/cidr.cpp	2009-07-28 15:29:02.881384386 -0400
     1.6 +@@ -199,11 +199,7 @@ void IPV4Cidr::set(const char *cp)
     1.7 + 	bitset((bit_t *)&netmask, getMask(cp));
     1.8 + 	setString(cbuf, sizeof(cbuf), cp);
     1.9 + 	
    1.10 +-#if defined(_MSC_VER) && _MSC_VER >= 1500
    1.11 +-	ep = (char *)strchr(cp, '/');
    1.12 +-#else
    1.13 +- 	ep = strchr(cp, '/');
    1.14 +-#endif
    1.15 ++ 	ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750
    1.16 + 
    1.17 + 	if(ep)
    1.18 + 		*ep = 0;
    1.19 +@@ -332,7 +328,7 @@ void IPV6Cidr::set(const char *cp)
    1.20 + 	memset(&netmask, 0, sizeof(netmask));
    1.21 + 	bitset((bit_t *)&netmask, getMask(cp));
    1.22 + 	setString(cbuf, sizeof(cbuf), cp);
    1.23 +-	ep = strchr(cp, '/');
    1.24 ++ 	ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750
    1.25 + 	if(ep)
    1.26 + 		*ep = 0;
    1.27 +