diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-02 02:01:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:13 -0500 |
| commit | 452ddd94ba22bebe0fda5ee6a7ddceae2057fe40 (patch) | |
| tree | f68b6554822c0d9aa1ceda711d2c28afa6aa9f4a /source4/lib/socket/socket_ipv4.c | |
| parent | 26c6b4c70bd85d8030a96651f2a255a4d48fcda1 (diff) | |
| download | samba-452ddd94ba22bebe0fda5ee6a7ddceae2057fe40.tar.gz samba-452ddd94ba22bebe0fda5ee6a7ddceae2057fe40.tar.bz2 samba-452ddd94ba22bebe0fda5ee6a7ddceae2057fe40.zip | |
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)
Diffstat (limited to 'source4/lib/socket/socket_ipv4.c')
| -rw-r--r-- | source4/lib/socket/socket_ipv4.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/source4/lib/socket/socket_ipv4.c b/source4/lib/socket/socket_ipv4.c index 9777705419..263f5aa255 100644 --- a/source4/lib/socket/socket_ipv4.c +++ b/source4/lib/socket/socket_ipv4.c @@ -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, - - .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, - - .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, - - .get_fd = ipv4_tcp_get_fd + .name = "ipv4", + .type = SOCKET_TYPE_STREAM, + + .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, + + .fn_set_option = ipv4_tcp_set_option, + + .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, + + .fn_get_fd = ipv4_tcp_get_fd }; const struct socket_ops *socket_ipv4_ops(void) |