Eliminate tons of build warnings on non-IPV6 system.

Michael
(This used to be commit ee4810099c2d26a0ebab3c41a95bc6b57921683d)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 269baa5a9cab6160111b09e4b118bfdb6a8f2192..36c71d753371c92510817e23e5d776eb0bd89d9a 100644 (file)
--- 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 a7c35c4887887ac76ced97989724471a92b4d009..2a659438720eead69f56bc9fedef0725b65079b3 100644 (file)
--- 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;