Avoid namespace clash detected by picky compilers

[disorder] / lib / addr.c

diff --git a/lib/addr.c b/lib/addr.c
index 8288e4ec01ebf6f66254356075858c62fddc77df..a7633219853043c6d03443052578b4dd31ed2f31 100644 (file)
--- a/lib/addr.c
+++ b/lib/addr.c
@@ -125,8 +125,8 @@ int addrinfocmp(const struct addrinfo *a,
   }
 }
 
   }
 }
 

-static inline int multicast4(const struct sockaddr_in *sin) {
-  return IN_MULTICAST(ntohl(sin->sin_addr.s_addr));
+static inline int multicast4(const struct sockaddr_in *sin4) {
+  return IN_MULTICAST(ntohl(sin4->sin_addr.s_addr));

 }
 
 static inline int multicast6(const struct sockaddr_in6 *sin6) {
 }
 
 static inline int multicast6(const struct sockaddr_in6 *sin6) {


@@ -145,17 +145,17 @@ int multicast(const struct sockaddr *sa) {
   }
 }
 
   }
 }
 

-static inline char *format_sockaddr4(const struct sockaddr_in *sin) {
+static inline char *format_sockaddr4(const struct sockaddr_in *sin4) {

   char buffer[1024], *r;
 
   char buffer[1024], *r;
 

-  if(sin->sin_port)
+  if(sin4->sin_port)

     byte_xasprintf(&r, "%s port %u",
     byte_xasprintf(&r, "%s port %u",

-                  inet_ntop(sin->sin_family, &sin->sin_addr,
+                  inet_ntop(sin4->sin_family, &sin4->sin_addr,

                             buffer, sizeof buffer),
                             buffer, sizeof buffer),

-                  ntohs(sin->sin_port));
+                  ntohs(sin4->sin_port));

   else
     byte_xasprintf(&r, "%s",
   else
     byte_xasprintf(&r, "%s",

-                  inet_ntop(sin->sin_family, &sin->sin_addr,
+                  inet_ntop(sin4->sin_family, &sin4->sin_addr,

                             buffer, sizeof buffer));
   return r;
 }
                             buffer, sizeof buffer));
   return r;
 }