diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/linux-atm/patches/patch-src_test_ttcp_c | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/linux-atm/patches/patch-src_test_ttcp_c')
| -rw-r--r-- | package/linux-atm/patches/patch-src_test_ttcp_c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/package/linux-atm/patches/patch-src_test_ttcp_c b/package/linux-atm/patches/patch-src_test_ttcp_c new file mode 100644 index 000000000..e436e9d9d --- /dev/null +++ b/package/linux-atm/patches/patch-src_test_ttcp_c @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- linux-atm-2.5.0.orig/src/test/ttcp.c 2005-04-18 18:18:28.000000000 +0200 ++++ linux-atm-2.5.0/src/test/ttcp.c 2009-05-29 21:27:32.488378268 +0200 +@@ -331,7 +331,7 @@ int no_check = 0; + /* xmitr */ + if (optind == argc) + goto usage; +- bzero((char *)&sinhim, sizeof(sinhim)); ++ memset((char *)&sinhim, 0, sizeof(sinhim)); + if (atoi(host) > 0 ) { + /* Numeric */ + sinhim.sin_family = AF_INET; +@@ -345,7 +345,7 @@ int no_check = 0; + if ((addr=gethostbyname(host)) == NULL) + err("bad hostname"); + sinhim.sin_family = addr->h_addrtype; +- bcopy(addr->h_addr,(char*)&addr_tmp, addr->h_length); ++ memcpy((char*)&addr_tmp, addr->h_addr, addr->h_length); + #if defined(cray) + sinhim.sin_addr = addr_tmp; + #else |