diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-02 03:58:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:15 -0500 |
| commit | 5011f901aa0140ed60a0b58e80ab0f14810ba432 (patch) | |
| tree | 379ad85e8627394a47bbac5e783e0955a5a5d481 /source4/lib/system.c | |
| parent | 2f7d7e47e38d88655baddad4e2e0572d4c158f70 (diff) | |
| download | samba-5011f901aa0140ed60a0b58e80ab0f14810ba432.tar.gz samba-5011f901aa0140ed60a0b58e80ab0f14810ba432.tar.bz2 samba-5011f901aa0140ed60a0b58e80ab0f14810ba432.zip | |
r3457: s_addr is a macro on solaris, so we can't use it in structure names. arrgh.
(This used to be commit 7842b23d01c53009259a2461600bd01159cecebf)
Diffstat (limited to 'source4/lib/system.c')
| -rw-r--r-- | source4/lib/system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/system.c b/source4/lib/system.c index 5e106c96eb..d50005e8c8 100644 --- a/source4/lib/system.c +++ b/source4/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; } |