4 files changed, 21 insertions, 18 deletions
diff --git a/cpukit/libnetworking/netinet/in.h b/cpukit/libnetworking/netinet/in.h
index 48e53e9496..d3e0654295 100644
--- a/cpukit/libnetworking/netinet/in.h
+++ b/cpukit/libnetworking/netinet/in.h
@@ -299,7 +299,7 @@ struct sockaddr_in {
 #define	INADDR_ALLRTRS_GROUP	(u_int32_t)0xe0000002	/* 224.0.0.2 */
 #define	INADDR_MAX_LOCAL_GROUP	(u_int32_t)0xe00000ff	/* 224.0.0.255 */
 
-#define	IN_LOOPBACKNET		127			/* official! */
+#define	IN_LOOPBACKNET		(u_int32_t)127			/* official! */
 
 /*
  * Structure used to describe IP options.
diff --git a/cpukit/libnetworking/netinet/ip_icmp.c b/cpukit/libnetworking/netinet/ip_icmp.c
index 26d9b8b491..92223751e2 100644
--- a/cpukit/libnetworking/netinet/ip_icmp.c
+++ b/cpukit/libnetworking/netinet/ip_icmp.c
@@ -699,7 +699,7 @@ iptime()
 	u_long t;
 
 	microtime(&atv);
-	t = (atv.tv_sec % (24*60*60)) * 1000 + atv.tv_usec / 1000;
+	t = (atv.tv_sec % (24L*60L*60L)) * 1000L + atv.tv_usec / 1000L;
 	return (htonl(t));
 }
 
diff --git a/cpukit/libnetworking/netinet/tcp.h b/cpukit/libnetworking/netinet/tcp.h
index a8c24f572b..96e28710c1 100644
--- a/cpukit/libnetworking/netinet/tcp.h
+++ b/cpukit/libnetworking/netinet/tcp.h
@@ -81,20 +81,23 @@ struct tcphdr {
 	u_short	th_urp;			/* urgent pointer */
 };
 
-#define	TCPOPT_EOL		0
-#define	TCPOPT_NOP		1
-#define	TCPOPT_MAXSEG		2
-#define    TCPOLEN_MAXSEG		4
-#define TCPOPT_WINDOW		3
-#define    TCPOLEN_WINDOW		3
-#define TCPOPT_SACK_PERMITTED	4		/* Experimental */
-#define    TCPOLEN_SACK_PERMITTED	2
-#define TCPOPT_SACK		5		/* Experimental */
-#define TCPOPT_TIMESTAMP	8
-#define    TCPOLEN_TIMESTAMP		10
-#define    TCPOLEN_TSTAMP_APPA		(TCPOLEN_TIMESTAMP+2) /* appendix A */
+#define	TCPOPT_EOL		0L
+#define	TCPOPT_NOP		1L
+#define	TCPOPT_MAXSEG		2L
+#define    TCPOLEN_MAXSEG		4L
+#define TCPOPT_WINDOW		3L
+#define    TCPOLEN_WINDOW		3L
+#define TCPOPT_SACK_PERMITTED	4L		/* Experimental */
+#define    TCPOLEN_SACK_PERMITTED	2L
+#define TCPOPT_SACK		5L		/* Experimental */
+#define TCPOPT_TIMESTAMP	8L
+#define    TCPOLEN_TIMESTAMP		10L
+#define    TCPOLEN_TSTAMP_APPA		(uint32_t)(TCPOLEN_TIMESTAMP+2) /* appendix A */
 #define    TCPOPT_TSTAMP_HDR		\
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
+    (uint32_t)(((uint32_t)TCPOPT_NOP<<24)| \
+               ((uint32_t)TCPOPT_NOP<<16)| \
+               ((uint32_t)TCPOPT_TIMESTAMP<<8)| \
+               ((uint32_t)TCPOLEN_TIMESTAMP))
 
 #define	TCPOPT_CC		11		/* CC options: RFC-1644 */
 #define TCPOPT_CCNEW		12
diff --git a/cpukit/libnetworking/netinet/tcp_seq.h b/cpukit/libnetworking/netinet/tcp_seq.h
index ffc64c50af..01505377ba 100644
--- a/cpukit/libnetworking/netinet/tcp_seq.h
+++ b/cpukit/libnetworking/netinet/tcp_seq.h
@@ -75,7 +75,7 @@
 	(tp)->snd_una = (tp)->snd_nxt = (tp)->snd_max = (tp)->snd_up = \
 	    (tp)->iss
 
-#define TCP_PAWS_IDLE	(24 * 24 * 60 * 60 * PR_SLOWHZ)
+#define TCP_PAWS_IDLE	(uint32_t)(24L * 24L * 60L * 60L * PR_SLOWHZ)
 					/* timestamp wrap-around time */
 
 #ifdef _KERNEL
@@ -91,9 +91,9 @@ extern tcp_cc	tcp_ccgen;		/* global connection count */
  * number in the range [0-0x3ffff] that is hard to predict.
  */
 #ifndef tcp_random18
-#define	tcp_random18()	((random() >> 14) & 0x3ffff)
+#define	tcp_random18()	(((uint32_t)random() >> 14) & 0x3ffffL)
 #endif
-#define	TCP_ISSINCR	(122*1024 + tcp_random18())
+#define	TCP_ISSINCR	(uint32_t)(122L*1024L + tcp_random18())
 
 extern tcp_seq	tcp_iss;		/* tcp initial send seq # */
 #else