4 files changed, 35 insertions, 1 deletions
diff --git a/ares/Makefile.dj b/ares/Makefile.dj
index 58ff9c6ae..23a9ecadf 100644
--- a/ares/Makefile.dj
+++ b/ares/Makefile.dj
@@ -11,7 +11,7 @@ include Makefile.inc
 CFLAGS += -DWATT32 -DHAVE_AF_INET6 -DHAVE_PF_INET6 -DHAVE_FIONBIO \
           -DHAVE_STRUCT_IN6_ADDR -DHAVE_SOCKADDR_IN6_SIN6_SCOPE_ID \
           -DHAVE_SYS_TIME_H -DHAVE_STRUCT_SOCKADDR_IN6 -DHAVE_STRUCT_ADDRINFO \
-          -DHAVE_SIGNAL_H -DHAVE_SIG_ATOMIC_T \
+          -DHAVE_SIGNAL_H -DHAVE_SIG_ATOMIC_T -DRETSIGTYPE='void' \
           -DHAVE_ARPA_NAMESER_H -DNS_INADDRSZ=4 -DHAVE_RECV -DHAVE_SEND \
           -DSEND_TYPE_ARG1='int'   -DSEND_QUAL_ARG2='const' \
           -DSEND_TYPE_ARG2='void*' -DSEND_TYPE_ARG3='int' \
diff --git a/ares/config-win32.h b/ares/config-win32.h
index 4b802e138..6fd81181e 100644
--- a/ares/config-win32.h
+++ b/ares/config-win32.h
@@ -126,6 +126,29 @@
 #endif
 
 /* ---------------------------------------------------------------- */
+/*                       TYPEDEF REPLACEMENTS                       */
+/* ---------------------------------------------------------------- */
+
+/* Define this if in_addr_t is not an available 'typedefed' type */
+#define in_addr_t unsigned long
+
+/* Define as the return type of signal handlers (int or void).  */
+#define RETSIGTYPE void
+
+/* Define ssize_t if it is not an available 'typedefed' type */
+#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__)
+#elif defined(_WIN64)
+#define ssize_t __int64
+#else
+#define ssize_t int
+#endif
+
+/* Define to 'int' if socklen_t is not an available 'typedefed' type */
+#ifndef HAVE_WS2TCPIP_H
+#define socklen_t int
+#endif
+
+/* ---------------------------------------------------------------- */
 /*                          STRUCT RELATED                          */
 /* ---------------------------------------------------------------- */
 
diff --git a/ares/configure.ac b/ares/configure.ac
index 71d4a0152..05262b965 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -299,6 +299,8 @@ TYPE_SOCKADDR_STORAGE
 
 TYPE_SIG_ATOMIC_T
 
+AC_TYPE_SIGNAL
+
 CURL_CHECK_FUNC_RECV
 
 CURL_CHECK_FUNC_SEND
diff --git a/ares/setup_once.h b/ares/setup_once.h
index 23d75ca0d..7c22b2aab 100644
--- a/ares/setup_once.h
+++ b/ares/setup_once.h
@@ -133,5 +133,14 @@ typedef int sig_atomic_t;
 #endif
 
 
+/*
+ * Default return type for signal handlers.
+ */
+
+#ifndef RETSIGTYPE
+#define RETSIGTYPE void
+#endif
+
+
 #endif /* __SETUP_ONCE_H */