From 5011f901aa0140ed60a0b58e80ab0f14810ba432 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2004 03:58:27 +0000 Subject: r3457: s_addr is a macro on solaris, so we can't use it in structure names. arrgh. (This used to be commit 7842b23d01c53009259a2461600bd01159cecebf) --- source4/lib/socket/socket_ipv4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/lib/socket') diff --git a/source4/lib/socket/socket_ipv4.c b/source4/lib/socket/socket_ipv4.c index 263f5aa255..eebbd61219 100644 --- a/source4/lib/socket/socket_ipv4.c +++ b/source4/lib/socket/socket_ipv4.c @@ -48,13 +48,13 @@ static NTSTATUS ipv4_tcp_connect(struct socket_context *sock, my_ip = interpret_addr2(my_address); - if (my_ip.s_addr != 0 || my_port != 0) { + if (my_ip.addr != 0 || my_port != 0) { struct sockaddr_in my_addr; ZERO_STRUCT(my_addr); #ifdef HAVE_SOCK_SIN_LEN my_addr.sin_len = sizeof(my_addr); #endif - my_addr.sin_addr.s_addr = my_ip.s_addr; + my_addr.sin_addr.s_addr = my_ip.addr; my_addr.sin_port = htons(my_port); my_addr.sin_family = PF_INET; @@ -70,7 +70,7 @@ static NTSTATUS ipv4_tcp_connect(struct socket_context *sock, #ifdef HAVE_SOCK_SIN_LEN srv_addr.sin_len = sizeof(srv_addr); #endif - srv_addr.sin_addr.s_addr= srv_ip.s_addr; + srv_addr.sin_addr.s_addr= srv_ip.addr; srv_addr.sin_port = htons(srv_port); srv_addr.sin_family = PF_INET; @@ -105,7 +105,7 @@ static NTSTATUS ipv4_tcp_listen(struct socket_context *sock, #ifdef HAVE_SOCK_SIN_LEN my_addr.sin_len = sizeof(my_addr); #endif - my_addr.sin_addr.s_addr = ip_addr.s_addr; + my_addr.sin_addr.s_addr = ip_addr.addr; my_addr.sin_port = htons(port); my_addr.sin_family = PF_INET; -- cgit