diff options
| author | Yang Tse <yangsita@gmail.com> | 2006-07-04 02:27:11 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2006-07-04 02:27:11 +0000 |
| commit | 55138753c63cb7a6d1191028df25b689b73baefa (patch) | |
| tree | 92fd56a386080ea72041fbe4430387e9c7456ffd | |
| parent | 43369b8096d14950f73a92126c4c5ba0bac4cd4a (diff) | |
Test HAVE_GETNAMEINFO definition before using GETNAMEINFO_XXX definitions.
| -rw-r--r-- | lib/hostip.h | 2 | ||||
| -rw-r--r-- | lib/hostip6.c | 2 | ||||
| -rw-r--r-- | lib/memdebug.h | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/lib/hostip.h b/lib/hostip.h index 3b8f8ce15..ade5efa28 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -196,6 +196,7 @@ int curl_dogetaddrinfo(char *hostname, char *service, struct addrinfo *hints, struct addrinfo **result, int line, const char *source); +#ifdef HAVE_GETNAMEINFO int curl_dogetnameinfo(GETNAMEINFO_QUAL_ARG1 GETNAMEINFO_TYPE_ARG1 sa, GETNAMEINFO_TYPE_ARG2 salen, char *host, GETNAMEINFO_TYPE_ARG46 hostlen, @@ -203,6 +204,7 @@ int curl_dogetnameinfo(GETNAMEINFO_QUAL_ARG1 GETNAMEINFO_TYPE_ARG1 sa, GETNAMEINFO_TYPE_ARG7 flags, int line, const char *source); #endif +#endif /* This is the callback function that is used when we build with asynch resolve, ipv4 */ diff --git a/lib/hostip6.c b/lib/hostip6.c index b17bce9be..b36d62d4c 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -136,6 +136,7 @@ int curl_dogetaddrinfo(char *hostname, char *service, return res; } +#ifdef HAVE_GETNAMEINFO int curl_dogetnameinfo(GETNAMEINFO_QUAL_ARG1 GETNAMEINFO_TYPE_ARG1 sa, GETNAMEINFO_TYPE_ARG2 salen, char *host, GETNAMEINFO_TYPE_ARG46 hostlen, @@ -160,6 +161,7 @@ int curl_dogetnameinfo(GETNAMEINFO_QUAL_ARG1 GETNAMEINFO_TYPE_ARG1 sa, } return res; } +#endif void curl_dofreeaddrinfo(struct addrinfo *freethis, int line, const char *source) diff --git a/lib/memdebug.h b/lib/memdebug.h index 4d965fb1f..d64defed6 100644 --- a/lib/memdebug.h +++ b/lib/memdebug.h @@ -96,10 +96,14 @@ CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source); #define getaddrinfo(host,serv,hint,res) \ curl_dogetaddrinfo(host,serv,hint,res,__LINE__,__FILE__) #endif + +#ifdef HAVE_GETNAMEINFO #undef getnameinfo #define getnameinfo(sa,salen,host,hostlen,serv,servlen,flags) \ curl_dogetnameinfo(sa,salen,host,hostlen,serv,servlen,flags, __LINE__, \ __FILE__) +#endif + #undef freeaddrinfo #define freeaddrinfo(data) \ curl_dofreeaddrinfo(data,__LINE__,__FILE__) |