summaryrefslogtreecommitdiff
path: root/source3/lib/replace/system/network.h
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-10-04 17:35:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:31:11 -0500
commitb5725f4fecf9ea3dfc999d8c6542dd1ba171f238 (patch)
tree7ddcb108f16081078b6e834c1b6d10f9066d0c47 /source3/lib/replace/system/network.h
parent941544a9514aaae89268bc9d689705ad0724119e (diff)
downloadsamba-b5725f4fecf9ea3dfc999d8c6542dd1ba171f238.tar.gz
samba-b5725f4fecf9ea3dfc999d8c6542dd1ba171f238.tar.bz2
samba-b5725f4fecf9ea3dfc999d8c6542dd1ba171f238.zip
r25507: Fix definition of struct sockaddr_storage if
struct sockaddr_in6 is defined. Jeremy. (This used to be commit 4cf17df5caeb2b0220f6a7dd82d5fed5aca56850)
Diffstat (limited to 'source3/lib/replace/system/network.h')
-rw-r--r--source3/lib/replace/system/network.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h
index a09d3bb01b..c2a5dec5af 100644
--- a/source3/lib/replace/system/network.h
+++ b/source3/lib/replace/system/network.h
@@ -127,9 +127,14 @@ typedef unsigned short int sa_family_t;
#endif
#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
+#define sockaddr_storage sockaddr_in6
+#define ss_family sin6_family
+#else
#define sockaddr_storage sockaddr_in
#define ss_family sin_family
#endif
+#endif
#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX 256