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/motion/patches/patch-track_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/motion/patches/patch-track_c')
| -rw-r--r-- | package/motion/patches/patch-track_c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/package/motion/patches/patch-track_c b/package/motion/patches/patch-track_c new file mode 100644 index 000000000..06e580e18 --- /dev/null +++ b/package/motion/patches/patch-track_c @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- motion-3.2.11.orig/track.c 2008-09-22 01:20:58.000000000 +0200 ++++ motion-3.2.11/track.c 2009-05-30 12:45:30.141690363 +0200 +@@ -165,7 +165,7 @@ static unsigned short int stepper_center + return 0; + } + +- bzero (&adtio, sizeof(adtio)); ++ memset (&adtio, 0, sizeof(adtio)); + adtio.c_cflag = STEPPER_BAUDRATE | CS8 | CLOCAL | CREAD; + adtio.c_iflag = IGNPAR; + adtio.c_oflag = 0; +@@ -323,7 +323,7 @@ static unsigned short int iomojo_center( + return 0; + } + +- bzero (&adtio, sizeof(adtio)); ++ memset (&adtio, 0, sizeof(adtio)); + adtio.c_cflag = IOMOJO_BAUDRATE | CS8 | CLOCAL | CREAD; + adtio.c_iflag = IGNPAR; + adtio.c_oflag = 0; |