aboutsummaryrefslogtreecommitdiffstats
path: root/clientname.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-01-28 18:50:49 +0000
committerWayne Davison <wayned@samba.org>2005-01-28 18:50:49 +0000
commit25ff04417e4b4fa0aeb44e0b1576a01021aa1650 (patch)
tree33747a607367dd1dd54d014d4e17a81e239de6bd /clientname.c
parent63ecee4d1ae76134d3ebd6272d2157f059b2cab6 (diff)
downloadandroid_external_rsync-25ff04417e4b4fa0aeb44e0b1576a01021aa1650.tar.gz
android_external_rsync-25ff04417e4b4fa0aeb44e0b1576a01021aa1650.tar.bz2
android_external_rsync-25ff04417e4b4fa0aeb44e0b1576a01021aa1650.zip
Use "#if" (not "#ifdef") for configure-defined macros.
Diffstat (limited to 'clientname.c')
-rw-r--r--clientname.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/clientname.c b/clientname.c
index 7b36f78b..ed8e97fd 100644
--- a/clientname.c
+++ b/clientname.c
@@ -132,7 +132,7 @@ char *client_name(int fd)
ss_len = sizeof (struct sockaddr_in);
memcpy(&ss, answer->ai_addr, ss_len);
break;
-#ifdef INET6
+#if INET6
case AF_INET6:
ss_len = sizeof (struct sockaddr_in6);
memcpy(&ss, answer->ai_addr, ss_len);
@@ -172,7 +172,7 @@ void client_sockaddr(int fd,
exit_cleanup(RERR_SOCKETIO);
}
-#ifdef INET6
+#if 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
@@ -261,7 +261,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
sizeof sin1->sin_addr);
}
-#ifdef INET6
+#if INET6
if (ss_family == AF_INET6) {
const struct sockaddr_in6 *sin1, *sin2;
@@ -278,7 +278,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
sizeof sin1->sin6_addr))
return 1;
-#ifdef HAVE_SOCKADDR_IN6_SCOPE_ID
+#if HAVE_SOCKADDR_IN6_SCOPE_ID
if (sin1->sin6_scope_id != sin2->sin6_scope_id)
return 1;
#endif