From a87d16a4f660f2d9d0b7e9d1f3b06390b0c376f1 Mon Sep 17 00:00:00 2001
From: jshepher <>
Date: Sat, 4 Dec 2004 00:50:00 +0000
Subject: [PATCH] Fixed GCC 3.x warning.

---
 libnix/sources/socket/arpa/inet_makeaddr.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libnix/sources/socket/arpa/inet_makeaddr.c b/libnix/sources/socket/arpa/inet_makeaddr.c
index e06423b..aac0c9b 100644
--- a/libnix/sources/socket/arpa/inet_makeaddr.c
+++ b/libnix/sources/socket/arpa/inet_makeaddr.c
@@ -45,16 +45,16 @@ static char sccsid[] = "@(#)inet_addr.c 5.10 (Berkeley) 2/24/91";
 struct in_addr
 inet_makeaddr(u_long net, u_long host)
 {
-  u_long addr;
+  struct in_addr addr;
 
   if (net < 128)
-    addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
+    addr.s_addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
   else if (net < 65536)
-    addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
+    addr.s_addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
   else if (net < 16777216L)
-    addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
+    addr.s_addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
   else
-    addr = net | host;
-  addr = htonl(addr);
-  return (*(struct in_addr *)&addr);
+    addr.s_addr = net | host;
+  addr.s_addr = htonl(addr.s_addr);
+  return addr;
 }