diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-12 13:15:49 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-12 13:15:49 +0000 |
| commit | eedd1be730c40054ffb8a4665b596fbb6dab7150 (patch) | |
| tree | 7ddedf777b9414a1aff8f8081dfa1197bdac9446 | |
| parent | d1d23a6e674b1c43544dc99681d31b287cc521ad (diff) | |
| download | busybox-eedd1be730c40054ffb8a4665b596fbb6dab7150.tar.gz | |
- remove warning about redeclaration of __constant_htons
- remove warning about format '%ld' expects type 'long int *', but argument #num
has type 'long unsigned int *'
| -rw-r--r-- | networking/libiproute/iptunnel.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index 52396efe8..23b5d5013 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c @@ -1,10 +1,7 @@ /* * iptunnel.c "ip tunnel" * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * @@ -31,7 +28,9 @@ #include <net/if_arp.h> #include <asm/types.h> +#ifndef __constant_htons #define __constant_htons htons +#endif #include <linux/if_tunnel.h> #include "rt_names.h" @@ -468,7 +467,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p) bb_error_msg("Wrong format of /proc/net/dev. Sorry."); return -1; } - if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld", + if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu", &rx_bytes, &rx_packets, &rx_errs, &rx_drops, &rx_fifo, &rx_frame, &rx_multi, &tx_bytes, &tx_packets, &tx_errs, &tx_drops, |