X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/25ff04417e4b4fa0aeb44e0b1576a01021aa1650..d051056f921f465c487a85f9fa29a2324332bc4b:/clientname.c

diff --git a/clientname.c b/clientname.c
index ed8e97fd..6d70827c 100644
--- a/clientname.c
+++ b/clientname.c
@@ -34,7 +34,6 @@
 #include "rsync.h"
 
 static const char default_name[] = "UNKNOWN";
-extern int am_daemon;
 extern int am_server;
 
 
@@ -132,7 +131,7 @@ char *client_name(int fd)
 			ss_len = sizeof (struct sockaddr_in);
 			memcpy(&ss, answer->ai_addr, ss_len);
 			break;
-#if INET6
+#ifdef INET6
 		case AF_INET6:
 			ss_len = sizeof (struct sockaddr_in6);
 			memcpy(&ss, answer->ai_addr, ss_len);
@@ -172,7 +171,7 @@ void client_sockaddr(int fd,
 		exit_cleanup(RERR_SOCKETIO);
 	}
 
-#if INET6
+#ifdef INET6
 	if (get_sockaddr_family(ss) == AF_INET6 &&
 	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)ss)->sin6_addr)) {
 		/* OK, so ss is in the IPv6 family, but it is really
@@ -189,7 +188,7 @@ void client_sockaddr(int fd,
 		memset(sin, 0, sizeof *sin);
 		sin->sin_family = AF_INET;
 		*ss_len = sizeof (struct sockaddr_in);
-#if HAVE_SOCKADDR_IN_LEN
+#ifdef HAVE_SOCKADDR_IN_LEN
 		sin->sin_len = *ss_len;
 #endif
 		sin->sin_port = sin6.sin6_port;
@@ -261,7 +260,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
 			      sizeof sin1->sin_addr);
 	}
 
-#if INET6
+#ifdef INET6
 	if (ss_family == AF_INET6) {
 		const struct sockaddr_in6 *sin1, *sin2;
 
@@ -278,7 +277,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
 			   sizeof sin1->sin6_addr))
 			return 1;
 
-#if HAVE_SOCKADDR_IN6_SCOPE_ID
+#ifdef HAVE_SOCKADDR_IN6_SCOPE_ID
 		if (sin1->sin6_scope_id != sin2->sin6_scope_id)
 			return 1;
 #endif
@@ -321,7 +320,6 @@ int check_name(int fd,
 		return error;
 	}
 
-
 	/* Given all these results, we expect that one of them will be
 	 * the same as ss.  The comparison is a bit complicated. */
 	for (res = res0; res; res = res->ai_next) {