diff options
author | Gisle Vanem <gvanem@broadpark.no> | 2006-04-26 17:23:28 +0000 |
---|---|---|
committer | Gisle Vanem <gvanem@broadpark.no> | 2006-04-26 17:23:28 +0000 |
commit | 3cbb1b2b64453c5504df5696ffbf72cb08e43f9c (patch) | |
tree | cd7d78df702dff218b638b7a614d796c20129b1b /lib/hostip6.c | |
parent | d75e58761370e4f4c5d496252509a3f2c98e6fd6 (diff) | |
download | curl-3cbb1b2b64453c5504df5696ffbf72cb08e43f9c.tar.gz |
Use the HAVE_MALLOC_H and HAVE_PROCESS_H defines
(more logical).
Diffstat (limited to 'lib/hostip6.c')
-rw-r--r-- | lib/hostip6.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/hostip6.c b/lib/hostip6.c index ae36ad738..693b98e4c 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -26,9 +26,9 @@ #include <string.h> #include <errno.h> -#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#ifdef HAVE_MALLOC_H #include <malloc.h> -#else +#endif #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -55,13 +55,12 @@ #include <inet.h> #include <stdlib.h> #endif -#endif #ifdef HAVE_SETJMP_H #include <setjmp.h> #endif -#ifdef WIN32 +#ifdef HAVE_PROCESS_H #include <process.h> #endif @@ -143,10 +142,10 @@ int curl_dogetnameinfo(const struct sockaddr *sa, socklen_t salen, char *serv, size_t servlen, int flags, int line, const char *source) { - int res = (getnameinfo)(sa, salen, - host, hostlen, - serv, servlen, - flags); + int res = (getnameinfo)(sa, salen, + host, hostlen, + serv, servlen, + flags); if(0 == res) { /* success */ if(logfile) |