summaryrefslogtreecommitdiffstats
path: root/source/lib/system.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-02 03:58:27 +0000
committerAndrew Tridgell <tridge@samba.org>2004-11-02 03:58:27 +0000
commitf2e8e241b90fec95eb76af39a30105d0cfe61809 (patch)
tree053a27e0b91fad015c37a51ba6d05aeeb443b51a /source/lib/system.c
parent9b6a77e60368ac9dffdbafa2aad4f9f9eddf3b68 (diff)
downloadsamba-f2e8e241b90fec95eb76af39a30105d0cfe61809.tar.gz
samba-f2e8e241b90fec95eb76af39a30105d0cfe61809.tar.xz
samba-f2e8e241b90fec95eb76af39a30105d0cfe61809.zip
r3457: s_addr is a macro on solaris, so we can't use it in structure names. arrgh.
Diffstat (limited to 'source/lib/system.c')
-rw-r--r--source/lib/system.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/lib/system.c b/source/lib/system.c
index 5e106c96eb5..d50005e8c8b 100644
--- a/source/lib/system.c
+++ b/source/lib/system.c
@@ -540,7 +540,7 @@ int sys_dup2(int oldfd, int newfd)
const char *sys_inet_ntoa(struct ipv4_addr in)
{
struct in_addr in2;
- in2.s_addr = in.s_addr;
+ in2.s_addr = in.addr;
return inet_ntoa(in2);
}
@@ -554,7 +554,7 @@ struct ipv4_addr sys_inet_makeaddr(int net, int host)
struct in_addr in;
struct ipv4_addr in2;
in = inet_makeaddr(net, host);
- in2.s_addr = in.s_addr;
+ in2.addr = in.s_addr;
return in2;
}