Merge branch 'master' into 1.1

[meshlink] / lib / fake-getnameinfo.c

diff --git a/lib/fake-getnameinfo.c b/lib/fake-getnameinfo.c
index a0e1df33752ba27564388871ca6cf1c6e74dd631..1eba49253ea387638844de3457e2efbdeb008e4e 100644 (file)
--- a/lib/fake-getnameinfo.c
+++ b/lib/fake-getnameinfo.c
@@ -14,10 +14,9 @@
 #include "fake-getnameinfo.h"
 #include "fake-getaddrinfo.h"
 
-#ifndef HAVE_GETNAMEINFO
+#if !HAVE_DECL_GETNAMEINFO
 
-int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags)
-{
+int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags) {
        struct sockaddr_in *sin = (struct sockaddr_in *)sa;
        struct hostent *hp;
        int len;
@@ -35,7 +34,7 @@ int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t host
                return 0;
 
        if(flags & NI_NUMERICHOST) {
-               len = snprintf((host, hostlen, "%s", inet_ntoa(sin->sin_addr));
+               len = snprintf(host, hostlen, "%s", inet_ntoa(sin->sin_addr));
                if(len < 0 || len >= hostlen)
                        return EAI_MEMORY;
                return 0;
@@ -46,7 +45,7 @@ int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t host
        if(!hp || !hp->h_name || !hp->h_name[0])
                return EAI_NODATA;
        
-       len = snprintf((host, hostlen, "%s", hp->h_name);
+       len = snprintf(host, hostlen, "%s", hp->h_name);
        if(len < 0 || len >= hostlen)
                return EAI_MEMORY;