diff options
author | Peter Korsgaard | 2012-05-31 09:23:23 +0200 |
---|---|---|
committer | Peter Korsgaard | 2012-05-31 09:23:23 +0200 |
commit | bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch) | |
tree | d6012109e704c5e9abc709c23a7133a3d4b4f779 /package/mrouted/mrouted-3.9.4-bcopy.patch | |
parent | Kickoff 2012.08 cycle (diff) | |
parent | nfs-utils: bump to version 1.2.6 (diff) | |
download | buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.gz buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.xz buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.zip |
Merge branch 'next'
Conflicts:
toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/mrouted/mrouted-3.9.4-bcopy.patch')
-rw-r--r-- | package/mrouted/mrouted-3.9.4-bcopy.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/package/mrouted/mrouted-3.9.4-bcopy.patch b/package/mrouted/mrouted-3.9.4-bcopy.patch deleted file mode 100644 index ea8f6dbf6..000000000 --- a/package/mrouted/mrouted-3.9.4-bcopy.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nura mrouted-3.9.4/mtrace.c mrouted-3.9.4-memmove/mtrace.c ---- mrouted-3.9.4/mtrace.c 2010-11-19 20:53:19.000000000 -0300 -+++ mrouted-3.9.4-memmove/mtrace.c 2012-05-03 08:27:33.895422455 -0300 -@@ -556,7 +556,7 @@ - save->rtime = ((tr.tv_sec + JAN_1970) << 16) + - (tr.tv_usec << 10) / 15625; - save->len = len; -- bcopy((char *)igmp, (char *)&save->igmp, ipdatalen); -+ memmove((char *)&save->igmp, (char *)igmp, ipdatalen); - } - return recvlen; - } -@@ -646,7 +646,7 @@ - base.rtime = ((tr.tv_sec + JAN_1970) << 16) + - (tr.tv_usec << 10) / 15625; - base.len = len; -- bcopy((char *)igmp, (char *)&base.igmp, ipdatalen); -+ memmove((char *)&base.igmp, (char *)igmp, ipdatalen); - /* - * If the user specified which traces to monitor, - * only accept traces that correspond to the |