|
@@ -151,18 +151,18 @@ libc_hidden_def(inet_ntoa)
|
|
*/
|
|
*/
|
|
struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
|
|
struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
|
|
{
|
|
{
|
|
- in_addr_t addr;
|
|
+ struct in_addr in;
|
|
|
|
|
|
if (net < 128)
|
|
if (net < 128)
|
|
- addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
|
|
+ in.s_addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
|
|
else if (net < 65536)
|
|
else if (net < 65536)
|
|
- addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
|
|
+ in.s_addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
|
|
else if (net < 16777216UL)
|
|
else if (net < 16777216UL)
|
|
- addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
|
|
+ in.s_addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
|
|
else
|
|
else
|
|
- addr = net | host;
|
|
+ in.s_addr = net | host;
|
|
- addr = htonl(addr);
|
|
+ in.s_addr = htonl(in.s_addr);
|
|
- return *(struct in_addr *)&addr;
|
|
+ return in;
|
|
}
|
|
}
|
|
libc_hidden_def(inet_makeaddr)
|
|
libc_hidden_def(inet_makeaddr)
|
|
#endif
|
|
#endif
|