X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=lib%2Ffake-getaddrinfo.c;h=df3d34764dc9680dd1d625cd10ed94e2bdfb19d0;hb=f1fec466e232c00c668422014029dce9114d3add;hp=161c826f3728e2cbaf531ebc61242e4f6e9001db;hpb=2236e05e518c9e317d82c027596bea5228725214;p=tinc diff --git a/lib/fake-getaddrinfo.c b/lib/fake-getaddrinfo.c index 161c826f..df3d3476 100644 --- a/lib/fake-getaddrinfo.c +++ b/lib/fake-getaddrinfo.c @@ -14,10 +14,11 @@ #include "ipv4.h" #include "ipv6.h" #include "fake-getaddrinfo.h" +#include "xalloc.h" -#ifndef HAVE_GAI_STRERROR -char *gai_strerror(int ecode) -{ + +#if !HAVE_DECL_GAI_STRERROR +char *gai_strerror(int ecode) { switch (ecode) { case EAI_NODATA: return "No address associated with hostname"; @@ -31,9 +32,8 @@ char *gai_strerror(int ecode) } #endif /* !HAVE_GAI_STRERROR */ -#ifndef HAVE_FREEADDRINFO -void freeaddrinfo(struct addrinfo *ai) -{ +#if !HAVE_DECL_FREEADDRINFO +void freeaddrinfo(struct addrinfo *ai) { struct addrinfo *next; while(ai) { @@ -44,9 +44,8 @@ void freeaddrinfo(struct addrinfo *ai) } #endif /* !HAVE_FREEADDRINFO */ -#ifndef HAVE_GETADDRINFO -static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr) -{ +#if !HAVE_DECL_GETADDRINFO +static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr) { struct addrinfo *ai; ai = xmalloc_and_zero(sizeof(struct addrinfo) + sizeof(struct sockaddr_in)); @@ -61,8 +60,7 @@ static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr) return ai; } -int getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *hints, struct addrinfo **res) -{ +int getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *hints, struct addrinfo **res) { struct addrinfo *prev = NULL; struct hostent *hp; struct in_addr in = {0};