X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/893c4cc0564c00dd541f9ee612be5896a7894679..2b284ee33d97c4414c49c45720a3566a58a93a18:/socket.c

diff --git a/socket.c b/socket.c
index 4ca87037..140480bc 100644
--- a/socket.c
+++ b/socket.c
@@ -431,10 +431,10 @@ int is_a_socket(int fd)
 
 static RETSIGTYPE sigchld_handler(UNUSED(int val))
 {
-	signal(SIGCHLD, sigchld_handler);
 #ifdef WNOHANG
 	while (waitpid(-1, NULL, WNOHANG) > 0) {}
 #endif
+	signal(SIGCHLD, sigchld_handler);
 }
 
 
@@ -698,7 +698,7 @@ static int socketpair_tcp(int fd[2])
 		goto failed;
 
 	memset(&sock2, 0, sizeof sock2);
-#ifdef HAVE_SOCKADDR_LEN
+#if HAVE_SOCKADDR_IN_LEN
 	sock2.sin_len = sizeof sock2;
 #endif
 	sock2.sin_family = PF_INET;