summaryrefslogtreecommitdiff
path: root/source4/include/includes.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-02 03:58:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:15 -0500
commit5011f901aa0140ed60a0b58e80ab0f14810ba432 (patch)
tree379ad85e8627394a47bbac5e783e0955a5a5d481 /source4/include/includes.h
parent2f7d7e47e38d88655baddad4e2e0572d4c158f70 (diff)
downloadsamba-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/includes.h')
-rw-r--r--source4/include/includes.h2
1 files changed, 1 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