aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2001-10-04 13:36:11 +0000
committerDaniel Stenberg <daniel@haxx.se>2001-10-04 13:36:11 +0000
commit47def8091c645f13499e82f02c466c30e846a506 (patch)
tree0f355aeedea5217fc6d5e85095c0360e68a7c236 /lib
parentcfb32ec0cdd617d2be0b7348cdc84a76bba85621 (diff)
made sure the correct pieces of code are compiled on IPv4-only hosts, and
the pack_hostent() is only compiled if gethostbyname_r() isn't present.
Diffstat (limited to 'lib')
-rw-r--r--lib/hostip.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/lib/hostip.c b/lib/hostip.c
index 5bea046b5..f02829a9d 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -66,6 +66,20 @@
#include "memdebug.h"
#endif
+/*
+ * This is a wrapper function for freeing name information in a protocol
+ * independent way. This takes care of using the appropriate underlaying
+ * proper function.
+ */
+void Curl_freeaddrinfo(void *freethis)
+{
+#ifdef ENABLE_IPV6
+ freeaddrinfo(freethis);
+#else
+ free(freethis);
+#endif
+}
+
/* --- resolve name or IP-number --- */
#ifdef ENABLE_IPV6
@@ -102,20 +116,6 @@ void curl_freeaddrinfo(struct addrinfo *freethis,
#endif
/*
- * This is a wrapper function for freeing name information in a protocol
- * independent way. This takes care of using the appropriate underlaying
- * proper function.
- */
-void Curl_freeaddrinfo(void *freethis)
-{
-#ifdef ENABLE_IPV6
- freeaddrinfo(freethis);
-#else
- free(freethis);
-#endif
-}
-
-/*
* Return name information about the given hostname and port number. If
* successful, the 'addrinfo' is returned and the forth argument will point to
* memory we need to free after use. That meory *MUST* be freed with
@@ -146,6 +146,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
}
#else /* following code is IPv4-only */
+#ifndef HAVE_GETHOSTBYNAME_R
/**
* Performs a "deep" copy of a hostent into a buffer
* (returns a pointer to the copy).
@@ -214,6 +215,7 @@ static struct hostent* pack_hostent(char* buf, struct hostent* orig)
return copy;
}
+#endif
static char *MakeIP(unsigned long num,char *addr, int addr_len)
{