Test HAVE_GETNAMEINFO definition before using GETNAMEINFO_XXX definitions.

diff --git a/lib/hostip.h b/lib/hostip.h
index 3b8f8ce1559f69d40c19bf8272765a8ae17d1b29..ade5efa28b3c7f356eaa8f78326866ba7e7d2dc6 100644 (file)
--- 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 b17bce9be622dcb6b7faf652368743c72bf74bff..b36d62d4cf992eadc05fa91d09dc1d06b1dd6448 100644 (file)
--- 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 4d965fb1f6a830a969e09669cddb09b47fdf8244..d64defed694b6518ac50627f4005538aaeba308c 100644 (file)
--- 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__)