diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-13 20:24:37 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:43:00 +0100 |
| commit | b09047b78e981af8ade6a72d426bfcb0e742995b (patch) | |
| tree | 2547a72c9814f190d83cb0f8ecac678976a72ff5 /source4/lib/util/system.c | |
| parent | 8517878144973aa23e653bfc7aabfbaef500c7e2 (diff) | |
| download | samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.gz samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.bz2 samba-b09047b78e981af8ade6a72d426bfcb0e742995b.zip | |
r25624: Remove ipv4_addr hack. Only causes 4 extra includes of system/network.h because we stripped down includes.
(This used to be commit 262c1c23a61f1f4fae13e0a61179fe98b682cecf)
Diffstat (limited to 'source4/lib/util/system.c')
| -rw-r--r-- | source4/lib/util/system.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/source4/lib/util/system.c b/source4/lib/util/system.c index 1ebc6e7e0f..9bd1800233 100644 --- a/source4/lib/util/system.c +++ b/source4/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; } |