John E. Malmberg convinced me to standardize on #ifs for defined

[rsync/rsync.git] / clientname.c

diff --git a/clientname.c b/clientname.c
index ed8e97f..270f09f 100644 (file)
--- 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;
                        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);
                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);
        }
 
                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
        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 +189,7 @@ void client_sockaddr(int fd,
                memset(sin, 0, sizeof *sin);
                sin->sin_family = AF_INET;
                *ss_len = sizeof (struct sockaddr_in);
                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;
                sin->sin_len = *ss_len;
 #endif
                sin->sin_port = sin6.sin6_port;


@@ -261,7 +261,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
                              sizeof sin1->sin_addr);
        }
 
                              sizeof sin1->sin_addr);
        }
 

-#if INET6
+#ifdef INET6

        if (ss_family == AF_INET6) {
                const struct sockaddr_in6 *sin1, *sin2;
 
        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;
 
                           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
                if (sin1->sin6_scope_id != sin2->sin6_scope_id)
                        return 1;
 #endif