Remove imp.h and exp.h header files

[ngircd-alex.git] / src / ngircd / resolve.c

diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index c7e600381e81b571ded2cd343887529418e7d59c..d3c89f89ef1ce6810c9150c08c13a004978129ef 100644 (file)
--- a/src/ngircd/resolve.c
+++ b/src/ngircd/resolve.c
@@ -18,7 +18,6 @@
  * Asynchronous resolver
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -42,11 +41,9 @@
 #include "log.h"
 #include "ng_ipaddr.h"
 
-#include "exp.h"
 #include "resolve.h"
 #include "io.h"
 
-
 static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd ));
 static void Do_ResolveName PARAMS(( const char *Host, int w_fd ));
 
@@ -242,7 +239,7 @@ ForwardLookup(const char *hostname, array *IpAddr, int af)
 {
        ng_ipaddr_t addr;
 
-#ifdef HAVE_GETADDRINFO
+#ifdef HAVE_WORKING_GETADDRINFO
        int res;
        struct addrinfo *a, *ai_results;
        static struct addrinfo hints;
@@ -268,9 +265,9 @@ ForwardLookup(const char *hostname, array *IpAddr, int af)
        }
 
        for (a = ai_results; a != NULL; a = a->ai_next) {
-               assert(a->ai_addrlen <= sizeof(addr));
+               assert((size_t)a->ai_addrlen <= sizeof(addr));
 
-               if (a->ai_addrlen > sizeof(addr))
+               if ((size_t)a->ai_addrlen > sizeof(addr))
                        continue;
 
                memcpy(&addr, a->ai_addr, a->ai_addrlen);