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/include | |
| 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/include')
| -rw-r--r-- | source4/include/includes.h | 2 | ||||
| -rw-r--r-- | source4/include/smb_macros.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index ce8f81c539..dca1824b22 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -169,7 +169,7 @@ typedef int socklen_t; system networking headers everywhere */ struct ipv4_addr { - uint32_t s_addr; + uint32_t addr; }; #ifndef MIN diff --git a/source4/include/smb_macros.h b/source4/include/smb_macros.h index 84978f4f70..02c8fc3af4 100644 --- a/source4/include/smb_macros.h +++ b/source4/include/smb_macros.h @@ -130,6 +130,7 @@ true if two IP addresses are equal ****************************************************************************/ #define ip_equal(ip1,ip2) ((ip1).s_addr == (ip2).s_addr) +#define ipv4_equal(ip1,ip2) ((ip1).addr == (ip2).addr) /***************************************************************** splits out the last subkey of a key |