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/util.h | |
parent | 8517878144973aa23e653bfc7aabfbaef500c7e2 (diff) | |
download | samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.gz samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.xz 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/util.h')
-rw-r--r-- | source4/lib/util/util.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h index 1960aa6196..71880c1c1a 100644 --- a/source4/lib/util/util.h +++ b/source4/lib/util/util.h @@ -254,13 +254,7 @@ void CatchChildLeaveStatus(void); /* The following definitions come from lib/util/system.c */ -/* - we use struct ipv4_addr to avoid having to include all the - system networking headers everywhere -*/ -struct ipv4_addr { - uint32_t addr; -}; +struct in_addr; /************************************************************************** A wrapper for gethostbyname() that tries avoids looking up hostnames @@ -268,8 +262,8 @@ in the root domain, which can cause dial-on-demand links to come up for no apparent reason. ****************************************************************************/ _PUBLIC_ struct hostent *sys_gethostbyname(const char *name); -_PUBLIC_ const char *sys_inet_ntoa(struct ipv4_addr in); -_PUBLIC_ struct ipv4_addr sys_inet_makeaddr(int net, int host); +_PUBLIC_ const char *sys_inet_ntoa(struct in_addr in); +_PUBLIC_ struct in_addr sys_inet_makeaddr(int net, int host); /* The following definitions come from lib/util/genrand.c */ @@ -676,17 +670,17 @@ _PUBLIC_ uint32_t interpret_addr(const char *str); /** A convenient addition to interpret_addr(). **/ -_PUBLIC_ struct ipv4_addr interpret_addr2(const char *str); +_PUBLIC_ struct in_addr interpret_addr2(const char *str); /** Check if an IP is the 0.0.0.0. **/ -_PUBLIC_ bool is_zero_ip(struct ipv4_addr ip); +_PUBLIC_ bool is_zero_ip(struct in_addr ip); /** Are two IPs on the same subnet? **/ -_PUBLIC_ bool same_net(struct ipv4_addr ip1,struct ipv4_addr ip2,struct ipv4_addr mask); +_PUBLIC_ bool same_net(struct in_addr ip1,struct in_addr ip2,struct in_addr mask); /** Check if a process exists. Does this work on all unixes? |