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-client_clilib_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/dhcp6/patches/patch-client_clilib_c')
| -rw-r--r-- | package/dhcp6/patches/patch-client_clilib_c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/package/dhcp6/patches/patch-client_clilib_c b/package/dhcp6/patches/patch-client_clilib_c deleted file mode 100644 index a9f416fa6..000000000 --- a/package/dhcp6/patches/patch-client_clilib_c +++ /dev/null @@ -1,22 +0,0 @@ -$Id$ ---- w-dhcp6-1.0-1.orig/client/clilib.c Sat Jun 28 23:21:17 2025 -+++ w-dhcp6-1.0-1/client/clilib.c Tue Jul 25 10:37:06 2006 -@@ -554,7 +554,7 @@ u_int8_t convert_character_to_hex (char - - void generate_trans_id (u_int32_t *trans_id) - { -- extern u_int32_t g_trans_id; -+ extern int g_trans_id; - time_t t; - srand (time (&t)); - *trans_id = 0; -@@ -890,9 +890,7 @@ void read_option (char *m, int index, in - break; - - default : --#if DEBUG == 3 - printf ("Unrecognized DUID type\n"); --#endif - } - - next_opt = (struct OPTIONS *) malloc (sizeof (struct OPTIONS)); |