cross-compile with ming32 is clean.

diff --git a/configure.ac b/configure.ac
index 3903838e9a6b8d84dd3740d47b47c8ee9695921c..0491454e3cb8a71e498e46b1977afd648ce88c1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -193,13 +193,7 @@ include_inttypes_h=''
 ])
 AC_SUBST(include_inttypes_h)
 
-AC_CHECK_TYPE(socklen_t, , 
-       [AC_DEFINE([socklen_t], [int], [Define to 'int' if not defined])], [
-AC_INCLUDES_DEFAULT
-#if HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-])
+ACX_TYPE_SOCKLEN_T
 AC_CHECK_TYPE(ssize_t, int)
 AC_CHECK_TYPE(in_addr_t, [], [AC_DEFINE([in_addr_t], [uint32_t], [in_addr_t])], [
 #if HAVE_SYS_TYPES_H
@@ -237,12 +231,16 @@ AC_REPLACE_FUNCS(inet_ntop)
 AC_REPLACE_FUNCS(snprintf)
 AC_REPLACE_FUNCS(strlcpy)
 AC_REPLACE_FUNCS(memmove)
-AC_CHECK_FUNCS([endprotoent endservent sleep random fcntl ioctlsocket])
+AC_CHECK_FUNCS([endprotoent endservent sleep random fcntl])
 
 ACX_CHECK_GETADDRINFO_WITH_INCLUDES
 if test $ac_cv_func_getaddrinfo = no; then
        AC_LIBOBJ([fake-rfc2553])
 fi
+if test "$USE_WINSOCK" = 1; then
+       AC_CHECK_TOOL(WINDRES, windres)
+fi
+ACX_FUNC_IOCTLSOCKET
 
 #AC_SEARCH_LIBS(RSA_new, [crypto])
 
@@ -306,7 +304,9 @@ AH_BOTTOM([
 #ifdef HAVE_WS2TCPIP_H
 #include <ws2tcpip.h>
 #endif
-])
+]
+AHX_CONFIG_W32_FD_SET_T
+)
 
 AH_BOTTOM([
 #ifndef B64_PTON

diff --git a/drill/configure.ac b/drill/configure.ac
index 26a354a52f621d4318052b9d8dc85f0b13592149..33f6f6f6ea24fb1f32686642c3bd07f721a2129e 100644 (file)
--- a/drill/configure.ac
+++ b/drill/configure.ac
@@ -159,14 +159,7 @@ AC_INCLUDES_DEFAULT
 # MinGW32 tests
 AC_CHECK_HEADERS([winsock2.h ws2tcpip.h],,, [AC_INCLUDES_DEFAULT])
 
-AC_CHECK_TYPE(socklen_t, , 
-       [AC_DEFINE([socklen_t], [int], [Define to 'int' if not defined])], [
-AC_INCLUDES_DEFAULT
-#if HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-])
-
+ACX_TYPE_SOCKLEN_T
 AC_CHECK_HEADERS([sys/param.h sys/mount.h],,,
 [AC_INCLUDES_DEFAULT]
 [
@@ -197,6 +190,8 @@ AC_CHECK_LIB(nsl, inet_pton)
 
 ACX_WITH_SSL_OPTIONAL
 
+ACX_CHECK_GETADDRINFO_WITH_INCLUDES
+
 LIBS_STC="$LIBS"
 AC_SUBST(LIBS_STC)
 

diff --git a/examples/configure.ac b/examples/configure.ac
index 791b3e9b56e45c45e6e92e006057bcd5ac4a3696..bb95853ee8a7f1f3f8b4064a3244557c7fbd4524 100644 (file)
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -159,14 +159,7 @@ AC_INCLUDES_DEFAULT
 #include <net/if.h>
 #endif])
 
-AC_CHECK_TYPE(socklen_t, , 
-       [AC_DEFINE([socklen_t], [int], [Define to 'int' if not defined])], [
-AC_INCLUDES_DEFAULT
-#if HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-])
-
+ACX_TYPE_SOCKLEN_T
 AC_CHECK_HEADERS([sys/param.h sys/mount.h],,,
 [AC_INCLUDES_DEFAULT]
 [

diff --git a/examples/ldns-notify.c b/examples/ldns-notify.c
index 8aa17bd7b336f31e7cda5b9c582719759da9ac2e..6d9ddc3274c6d3b04cef2dab1d6e0e7388a28f0c 100644 (file)
--- a/examples/ldns-notify.c
+++ b/examples/ldns-notify.c
@@ -71,8 +71,8 @@ notify_host(int s, struct addrinfo* res, uint8_t* wire, size_t wiresize,
        
        while(!got_ack) {
                /* send it */
-               if(sendto(s, wire, wiresize, 0, res->ai_addr, res->ai_addrlen)
-                       == -1) {
+               if(sendto(s, (void*)wire, wiresize, 0, 
+                       res->ai_addr, res->ai_addrlen) == -1) {
                        printf("warning: send to %s failed: %s\n",
                                addrstr, strerror(errno));
                        close(s);
@@ -108,7 +108,7 @@ notify_host(int s, struct addrinfo* res, uint8_t* wire, size_t wiresize,
 
        /* got reply */
        addrlen = res->ai_addrlen;
-       received = recvfrom(s, replybuf, sizeof(replybuf), 0,
+       received = recvfrom(s, (void*)replybuf, sizeof(replybuf), 0,
                res->ai_addr, &addrlen);
        res->ai_addrlen = addrlen;
 

diff --git a/examples/ldns-testns.c b/examples/ldns-testns.c
index 418483ab949a2e45cefe0b885bde517eca3d66e3..2e89db9e40b74d5214b060e9df7b2718cece02dc 100644 (file)
--- a/examples/ldns-testns.c
+++ b/examples/ldns-testns.c
@@ -229,7 +229,7 @@ send_udp(uint8_t* buf, size_t len, void* data)
        struct handle_udp_userdata *userdata = (struct handle_udp_userdata*)data;
        /* udp send reply */
        ssize_t nb;
-       nb = sendto(userdata->udp_sock, buf, len, 0, 
+       nb = sendto(userdata->udp_sock, (void*)buf, len, 0, 
                (struct sockaddr*)&userdata->addr_him, userdata->hislen);
        if(nb == -1)
                log_msg("sendto(): %s\n", strerror(errno));
@@ -248,7 +248,7 @@ handle_udp(int udp_sock, struct entry* entries, int *count)
 
        userdata.hislen = (socklen_t)sizeof(userdata.addr_him);
        /* udp recv */
-       nb = recvfrom(udp_sock, inbuf, INBUF_SIZE, 0, 
+       nb = recvfrom(udp_sock, (void*)inbuf, INBUF_SIZE, 0, 
                (struct sockaddr*)&userdata.addr_him, &userdata.hislen);
        if (nb < 1) {
 #ifndef USE_WINSOCK
@@ -270,7 +270,7 @@ read_n_bytes(int sock, uint8_t* buf, size_t sz)
 {
        size_t count = 0;
        while(count < sz) {
-               ssize_t nb = recv(sock, buf+count, sz-count, 0);
+               ssize_t nb = recv(sock, (void*)(buf+count), sz-count, 0);
                if(nb < 0) {
                        log_msg("recv(): %s\n", strerror(errno));
                        return;
@@ -284,7 +284,7 @@ write_n_bytes(int sock, uint8_t* buf, size_t sz)
 {
        size_t count = 0;
        while(count < sz) {
-               ssize_t nb = send(sock, buf+count, sz-count, 0);
+               ssize_t nb = send(sock, (void*)(buf+count), sz-count, 0);
                if(nb < 0) {
                        log_msg("send(): %s\n", strerror(errno));
                        return;

diff --git a/examples/ldnsd.c b/examples/ldnsd.c
index e17bea5cbff458631225658a1c45c840ab354ff4..56cf2e0c992945e27cd825601993ac48afa601f5 100644 (file)
--- a/examples/ldnsd.c
+++ b/examples/ldnsd.c
@@ -175,7 +175,8 @@ main(int argc, char **argv)
 
        /* Done. Now receive */
        while (1) {
-               nb = recvfrom(sock, inbuf, INBUF_SIZE, 0, &addr_him, &hislen);
+               nb = recvfrom(sock, (void*)inbuf, INBUF_SIZE, 0, 
+                       &addr_him, &hislen);
                if (nb < 1) {
                        fprintf(stderr, "%s: recvfrom(): %s\n",
                        argv[0], strerror(errno));
@@ -220,7 +221,8 @@ main(int argc, char **argv)
                if (status != LDNS_STATUS_OK) {
                        printf("Error creating answer: %s\n", ldns_get_errorstr_by_id(status));
                } else {
-                       nb = sendto(sock, outbuf, answer_size, 0, &addr_him, hislen);
+                       nb = sendto(sock, (void*)outbuf, answer_size, 0, 
+                               &addr_him, hislen);
                }
                
                ldns_pkt_free(query_pkt);

diff --git a/net.c b/net.c
index 89f83e85cd7a9a766056985ac7c1eecc36fead91..fc8ba9686870081c05219e940e1fd754101e147c 100644 (file)
--- a/net.c
+++ b/net.c
@@ -233,7 +233,7 @@ ldns_sock_nonblock(int sockfd)
        }
 #elif defined(HAVE_IOCTLSOCKET)
        unsigned long on = 1;
-       if(ioctlsocket(s, FIONBIO, &on) != 0) {
+       if(ioctlsocket(sockfd, FIONBIO, &on) != 0) {
                /* ignore error, continue blockingly */
        }
 #endif
@@ -253,7 +253,7 @@ ldns_sock_block(int sockfd)
        }
 #elif defined(HAVE_IOCTLSOCKET)
        unsigned long off = 0;
-       if(ioctlsocket(s, FIONBIO, &off) != 0) {
+       if(ioctlsocket(sockfd, FIONBIO, &off) != 0) {
                /* ignore error, continue */
        }
 #endif
@@ -266,7 +266,7 @@ ldns_sock_wait(int sockfd, struct timeval timeout, int write)
        fd_set fds;
        int ret;
        FD_ZERO(&fds);
-       FD_SET(sockfd, &fds);
+       FD_SET(FD_SET_T sockfd, &fds);
        if(write)
                ret = select(sockfd+1, NULL, &fds, NULL, &timeout);
        else