From 5011f901aa0140ed60a0b58e80ab0f14810ba432 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2004 03:58:27 +0000 Subject: r3457: s_addr is a macro on solaris, so we can't use it in structure names. arrgh. (This used to be commit 7842b23d01c53009259a2461600bd01159cecebf) --- source4/include/includes.h | 2 +- source4/include/smb_macros.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/include') 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 -- cgit