r25624: Remove ipv4_addr hack. Only causes 4 extra includes of system/network.h becau...

[bbaumbach/samba-autobuild/.git] / source / lib / util / system.c

diff --git a/source/lib/util/system.c b/source/lib/util/system.c
index 1ebc6e7e0f66a2a92981a88325e6c185e5c3d352..9bd180023356cff1970acf352e9c1776ddbe37b6 100644 (file)
--- a/source/lib/util/system.c
+++ b/source/lib/util/system.c
@@ -79,19 +79,12 @@ _PUBLIC_ struct hostent *sys_gethostbyname(const char *name)
 #endif /* REDUCE_ROOT_DNS_LOOKUPS */
 }
 
-_PUBLIC_ const char *sys_inet_ntoa(struct ipv4_addr in)
-{
-       struct in_addr in2;
-       in2.s_addr = in.addr;
-       return inet_ntoa(in2);
-}
-
-_PUBLIC_ struct ipv4_addr sys_inet_makeaddr(int net, int host)
+_PUBLIC_ struct in_addr sys_inet_makeaddr(int net, int host)
 {
        struct in_addr in;
-       struct ipv4_addr in2;
+       struct in_addr in2;
        in = inet_makeaddr(net, host);
-       in2.addr = in.s_addr;
+       in2.s_addr = in.s_addr;
        return in2;
 }