1
0
mirror of https://github.com/samba-team/samba.git synced 2025-12-21 20:23:50 +03:00

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 ced1a0fcdc)
This commit is contained in:
Andrew Tridgell
2004-11-02 02:01:04 +00:00
committed by Gerald (Jerry) Carter
parent 26c6b4c70b
commit 452ddd94ba
8 changed files with 96 additions and 95 deletions

View File

@@ -310,26 +310,26 @@ static int ipv4_tcp_get_fd(struct socket_context *sock)
}
static const struct socket_ops ipv4_tcp_ops = {
.name = "ipv4",
.type = SOCKET_TYPE_STREAM,
.name = "ipv4",
.type = SOCKET_TYPE_STREAM,
.init = ipv4_tcp_init,
.connect = ipv4_tcp_connect,
.listen = ipv4_tcp_listen,
.accept = ipv4_tcp_accept,
.recv = ipv4_tcp_recv,
.send = ipv4_tcp_send,
.close = ipv4_tcp_close,
.fn_init = ipv4_tcp_init,
.fn_connect = ipv4_tcp_connect,
.fn_listen = ipv4_tcp_listen,
.fn_accept = ipv4_tcp_accept,
.fn_recv = ipv4_tcp_recv,
.fn_send = ipv4_tcp_send,
.fn_close = ipv4_tcp_close,
.set_option = ipv4_tcp_set_option,
.fn_set_option = ipv4_tcp_set_option,
.get_peer_name = ipv4_tcp_get_peer_name,
.get_peer_addr = ipv4_tcp_get_peer_addr,
.get_peer_port = ipv4_tcp_get_peer_port,
.get_my_addr = ipv4_tcp_get_my_addr,
.get_my_port = ipv4_tcp_get_my_port,
.fn_get_peer_name = ipv4_tcp_get_peer_name,
.fn_get_peer_addr = ipv4_tcp_get_peer_addr,
.fn_get_peer_port = ipv4_tcp_get_peer_port,
.fn_get_my_addr = ipv4_tcp_get_my_addr,
.fn_get_my_port = ipv4_tcp_get_my_port,
.get_fd = ipv4_tcp_get_fd
.fn_get_fd = ipv4_tcp_get_fd
};
const struct socket_ops *socket_ipv4_ops(void)