diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-06-15 11:33:51 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-06-15 11:33:51 +0000 |
commit | d537b1d7289030dc9986aeeeb37d94b1237f7a3c (patch) | |
tree | c4bc9378e97037ab7c57174e9495e6cc7924d574 /cpukit | |
parent | 2010-06-15 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-d537b1d7289030dc9986aeeeb37d94b1237f7a3c.tar.bz2 |
2010-06-15 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/netinet/ip_fw.c, libnetworking/netinet/ip_input.c:
Misc. 64bit-compatibility fixes.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/libnetworking/netinet/ip_fw.c | 3 | ||||
-rw-r--r-- | cpukit/libnetworking/netinet/ip_input.c | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 8ecaf20bde..440ee637e3 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2010-06-15 Ralf Corsépius <ralf.corsepius@rtems.org> + * libnetworking/netinet/ip_fw.c, libnetworking/netinet/ip_input.c: + Misc. 64bit-compatibility fixes. + +2010-06-15 Ralf Corsépius <ralf.corsepius@rtems.org> + * libmisc/shell/print-ls.c, libmisc/shell/main_msdosfmt.c: Include <inttypes.h>. Misc. 64bit-compatibility fixes. diff --git a/cpukit/libnetworking/netinet/ip_fw.c b/cpukit/libnetworking/netinet/ip_fw.c index 5455b48d8d..82c52b21f2 100644 --- a/cpukit/libnetworking/netinet/ip_fw.c +++ b/cpukit/libnetworking/netinet/ip_fw.c @@ -78,7 +78,8 @@ SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose_limit, CTLFLAG_RW, &fw_verbose_lim #define dprintf(a) if (!fw_debug); else printf a -#define print_ip(a) printf("%ld.%ld.%ld.%ld",(ntohl(a.s_addr)>>24)&0xFF,\ +#define print_ip(a) printf("%"PRId32".%"PRId32".%"PRId32".%"PRId32,\ + (ntohl(a.s_addr)>>24)&0xFF,\ (ntohl(a.s_addr)>>16)&0xFF,\ (ntohl(a.s_addr)>>8)&0xFF,\ (ntohl(a.s_addr))&0xFF); diff --git a/cpukit/libnetworking/netinet/ip_input.c b/cpukit/libnetworking/netinet/ip_input.c index a77c171ef3..582067d1a6 100644 --- a/cpukit/libnetworking/netinet/ip_input.c +++ b/cpukit/libnetworking/netinet/ip_input.c @@ -1188,7 +1188,7 @@ ip_srcroute(void) *(mtod(m, struct in_addr *)) = *p--; #ifdef DIAGNOSTIC if (ipprintfs) - printf(" hops %lx", ntohl(mtod(m, struct in_addr *)->s_addr)); + printf(" hops %"PRIx32, ntohl(mtod(m, struct in_addr *)->s_addr)); #endif /* @@ -1208,7 +1208,7 @@ ip_srcroute(void) while (p >= ip_srcrt.route) { #ifdef DIAGNOSTIC if (ipprintfs) - printf(" %lx", ntohl(q->s_addr)); + printf(" %"PRIx32, ntohl(q->s_addr)); #endif *q++ = *p--; } @@ -1218,7 +1218,7 @@ ip_srcroute(void) *q = ip_srcrt.dst; #ifdef DIAGNOSTIC if (ipprintfs) - printf(" %lx\n", ntohl(q->s_addr)); + printf(" %"PRIx32"\n", ntohl(q->s_addr)); #endif return (m); } @@ -1294,7 +1294,7 @@ ip_forward(struct mbuf *m, int srcrt) dest = 0; #ifdef DIAGNOSTIC if (ipprintfs) - printf("forward: src %lx dst %lx ttl %x\n", + printf("forward: src %"PRIx32" dst %"PRIx32" ttl %x\n", ip->ip_src.s_addr, ip->ip_dst.s_addr, ip->ip_ttl); #endif |