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/dhcp6/patches/patch-server_macros_h | |
| 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/dhcp6/patches/patch-server_macros_h')
| -rw-r--r-- | package/dhcp6/patches/patch-server_macros_h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/package/dhcp6/patches/patch-server_macros_h b/package/dhcp6/patches/patch-server_macros_h deleted file mode 100644 index 916e4c798..000000000 --- a/package/dhcp6/patches/patch-server_macros_h +++ /dev/null @@ -1,10 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- w-dhcp6-1.0-1.orig/server/macros.h 2002-06-28 14:50:04.000000000 +0200 -+++ w-dhcp6-1.0-1/server/macros.h 2008-10-20 15:30:53.000000000 +0200 -@@ -1,5 +1,5 @@ - #define INITIALIZE_SOCKADDR(x){ \ -- bzero((char *) &(x), sizeof((x))); \ -+ memset((char *) &(x), 0, sizeof((x))); \ - (x).sin6_family = AF_INET6; \ - (x).sin6_flowinfo = htonl(0); \ - (x).sin6_scope_id = 0; \ |