r3450: portability fixes

 - fix rep_inet_ntoa() for IRIX
 - lib/signal.c needs system/wait.h
 - some systems define a macro "accept", which breaks the lib/socket/ structures.
   use fn_ as a prefix for the structure elements to avoid the problem
(This used to be commit ced1a0fcdc8d8e47755ce4391c19f8b12862eb60)

1 files changed, 20 insertions, 20 deletions

diff --git a/source4/lib/socket/socket_ipv6.c b/source4/lib/socket/socket_ipv6.c
index 75e6fcab5c..c8683446ec 100644
--- a/source4/lib/socket/socket_ipv6.c
+++ b/source4/lib/socket/socket_ipv6.c
@@ -328,26 +328,26 @@ static int ipv6_tcp_get_fd(struct socket_context *sock)
 }
 
 static const struct socket_ops ipv6_tcp_ops = {
-	.name		= "ipv6",
-	.type		= SOCKET_TYPE_STREAM,
-
-	.init		= ipv6_tcp_init,
-	.connect	= ipv6_tcp_connect,
-	.listen		= ipv6_tcp_listen,
-	.accept		= ipv6_tcp_accept,
-	.recv		= ipv6_tcp_recv,
-	.send		= ipv6_tcp_send,
-	.close		= ipv6_tcp_close,
-
-	.set_option	= ipv6_tcp_set_option,
-
-	.get_peer_name	= ipv6_tcp_get_peer_name,
-	.get_peer_addr	= ipv6_tcp_get_peer_addr,
-	.get_peer_port	= ipv6_tcp_get_peer_port,
-	.get_my_addr	= ipv6_tcp_get_my_addr,
-	.get_my_port	= ipv6_tcp_get_my_port,
-
-	.get_fd		= ipv6_tcp_get_fd
+	.name			= "ipv6",
+	.type			= SOCKET_TYPE_STREAM,
+
+	.fn_init		= ipv6_tcp_init,
+	.fn_connect		= ipv6_tcp_connect,
+	.fn_listen		= ipv6_tcp_listen,
+	.fn_accept		= ipv6_tcp_accept,
+	.fn_recv		= ipv6_tcp_recv,
+	.fn_send		= ipv6_tcp_send,
+	.fn_close		= ipv6_tcp_close,
+
+	.fn_set_option		= ipv6_tcp_set_option,
+
+	.fn_get_peer_name	= ipv6_tcp_get_peer_name,
+	.fn_get_peer_addr	= ipv6_tcp_get_peer_addr,
+	.fn_get_peer_port	= ipv6_tcp_get_peer_port,
+	.fn_get_my_addr		= ipv6_tcp_get_my_addr,
+	.fn_get_my_port		= ipv6_tcp_get_my_port,
+
+	.fn_get_fd		= ipv6_tcp_get_fd
 };
 
 const struct socket_ops *socket_ipv6_ops(void)