diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2003-05-13 12:12:17 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2003-05-13 12:12:17 +0000 |
| commit | e615d117a010e068f3d0639928cc9555b14c0077 (patch) | |
| tree | 84ed73313e01924656dcf200b45b983798bdabaf | |
| parent | a51258b6bbec9e075894f5aa2e180b6c40613ba8 (diff) | |
Setup and use CURL_INADDR_NONE all over instead of INADDR_NONE. We setup
the define accordingly in the hostip.h header to work nicely all over.
| -rw-r--r-- | lib/connect.c | 8 | ||||
| -rw-r--r-- | lib/hostip.c | 7 | ||||
| -rw-r--r-- | lib/hostip.h | 7 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lib/connect.c b/lib/connect.c index 125d388d8..9a78f1610 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -197,10 +197,6 @@ static CURLcode bindlocal(struct connectdata *conn, #ifdef HAVE_INET_NTOA -#ifndef INADDR_NONE -#define INADDR_NONE (in_addr_t) ~0 -#endif - struct SessionHandle *data = conn->data; /************************************************************* @@ -216,7 +212,7 @@ static CURLcode bindlocal(struct connectdata *conn, /* First check if the given name is an IP address */ in=inet_addr(data->set.device); - if((in == INADDR_NONE) && + if((in == CURL_INADDR_NONE) && Curl_if2ip(data->set.device, myhost, sizeof(myhost))) { /* * We now have the numerical IPv4-style x.y.z.w in the 'myhost' buffer @@ -250,7 +246,7 @@ static CURLcode bindlocal(struct connectdata *conn, infof(data, "We bind local end to %s\n", myhost); in=inet_addr(myhost); - if (INADDR_NONE != in) { + if (CURL_INADDR_NONE != in) { if ( h ) { Curl_addrinfo *addr = h->addr; diff --git a/lib/hostip.c b/lib/hostip.c index 8df43fc10..dc38b9f74 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -532,10 +532,6 @@ static char *MakeIP(unsigned long num, char *addr, int addr_len) return (addr); } -#ifndef INADDR_NONE -#define INADDR_NONE (in_addr_t) ~0 -#endif - static void hostcache_fixoffset(struct hostent *h, int offset) { int i=0; @@ -573,7 +569,8 @@ static Curl_addrinfo *my_getaddrinfo(struct SessionHandle *data, port=0; /* unused in IPv4 code */ ret = 0; /* to prevent the compiler warning */ - if ( (in=inet_addr(hostname)) != INADDR_NONE ) { + in=inet_addr(hostname); + if (in != CURL_INADDR_NONE) { struct in_addr *addrentry; struct namebuf { struct hostent hostentry; diff --git a/lib/hostip.h b/lib/hostip.h index fc1474c39..d07b75e3d 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -79,4 +79,11 @@ int curl_getaddrinfo(char *hostname, char *service, int line, const char *source); #endif +#ifndef INADDR_NONE +#define CURL_INADDR_NONE (in_addr_t) ~0 +#else +#define CURL_INADDR_NONE INADDR_NONE +#endif + + #endif |