From 452ddd94ba22bebe0fda5ee6a7ddceae2057fe40 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 2 Nov 2004 02:01:04 +0000
Subject: 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)
---
 source4/lib/socket/socket_unix.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'source4/lib/socket/socket_unix.c')

diff --git a/source4/lib/socket/socket_unix.c b/source4/lib/socket/socket_unix.c
index d160d897ee..f09573802a 100644
--- a/source4/lib/socket/socket_unix.c
+++ b/source4/lib/socket/socket_unix.c
@@ -246,26 +246,26 @@ static int unixdom_get_fd(struct socket_context *sock)
 }
 
 static const struct socket_ops unixdom_ops = {
-	.name		= "unix",
-	.type		= SOCKET_TYPE_STREAM,
-
-	.init		= unixdom_init,
-	.connect	= unixdom_connect,
-	.listen		= unixdom_listen,
-	.accept		= unixdom_accept,
-	.recv		= unixdom_recv,
-	.send		= unixdom_send,
-	.close		= unixdom_close,
-
-	.set_option	= unixdom_set_option,
-
-	.get_peer_name	= unixdom_get_peer_name,
-	.get_peer_addr	= unixdom_get_peer_addr,
-	.get_peer_port	= unixdom_get_peer_port,
-	.get_my_addr	= unixdom_get_my_addr,
-	.get_my_port	= unixdom_get_my_port,
-
-	.get_fd		= unixdom_get_fd
+	.name			= "unix",
+	.type			= SOCKET_TYPE_STREAM,
+
+	.fn_init		= unixdom_init,
+	.fn_connect		= unixdom_connect,
+	.fn_listen		= unixdom_listen,
+	.fn_accept		= unixdom_accept,
+	.fn_recv		= unixdom_recv,
+	.fn_send		= unixdom_send,
+	.fn_close		= unixdom_close,
+
+	.fn_set_option		= unixdom_set_option,
+
+	.fn_get_peer_name	= unixdom_get_peer_name,
+	.fn_get_peer_addr	= unixdom_get_peer_addr,
+	.fn_get_peer_port	= unixdom_get_peer_port,
+	.fn_get_my_addr		= unixdom_get_my_addr,
+	.fn_get_my_port		= unixdom_get_my_port,
+
+	.fn_get_fd		= unixdom_get_fd
 };
 
 const struct socket_ops *socket_unixdom_ops(void)
-- 
cgit