summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-02-29 13:35:16 +0100
committerMichael Adam <obnox@samba.org>2008-02-29 13:35:16 +0100
commite9c2515df0ac92e275da3dcd62de6cc50009bf6e (patch)
tree092fbf7b8566a64b9a8f65b82bdb17519e9ec930
parentaf3e746d9e79f96d004b0f50760b4918ce57eb3a (diff)
downloadsamba-e9c2515df0ac92e275da3dcd62de6cc50009bf6e.tar.gz
samba-e9c2515df0ac92e275da3dcd62de6cc50009bf6e.tar.bz2
samba-e9c2515df0ac92e275da3dcd62de6cc50009bf6e.zip
Eliminate tons of build warnings on non-IPV6 system.
Michael (This used to be commit ee4810099c2d26a0ebab3c41a95bc6b57921683d)
-rw-r--r--source3/include/includes.h5
-rw-r--r--source3/lib/util_sock.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 269baa5a9c..36c71d7533 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1289,4 +1289,9 @@ void exit_server_fault(void) NORETURN_ATTRIBUTE ;
#include "libnscd.h"
#endif
+#if defined(HAVE_IPV6)
+void in6_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
+ struct in6_addr ip);
+#endif
+
#endif /* _INCLUDES_H */
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index a7c35c4887..2a65943872 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -370,7 +370,7 @@ void in_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
Convert an IPv6 struct in_addr to a struct sockaddr_storage.
********************************************************************/
-void in6_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
+ void in6_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
struct in6_addr ip)
{
struct sockaddr_in6 *sa = (struct sockaddr_in6 *)ss;