Commit a46f55b9 authored by Yang Tse's avatar Yang Tse
Browse files

Make sure RETSIGTYPE is properly defined

parent a634f644

ares/Makefile.dj

+1 −1
Original line number Diff line number Diff line
@@ -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' \

ares/config-win32.h

+23 −0
Original line number Diff line number Diff line
@@ -125,6 +125,29 @@ 
  #undef HAVE_WS2TCPIP_H

#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                          */

/* ---------------------------------------------------------------- */

ares/configure.ac

+2 −0
Original line number Diff line number Diff line
@@ -299,6 +299,8 @@ TYPE_SOCKADDR_STORAGE 


TYPE_SIG_ATOMIC_T



AC_TYPE_SIGNAL



CURL_CHECK_FUNC_RECV



CURL_CHECK_FUNC_SEND

ares/setup_once.h

+9 −0
Original line number Diff line number Diff line
@@ -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 */

configure.ac

+3 −1
Original line number Diff line number Diff line
@@ -1633,6 +1633,8 @@ TYPE_SOCKADDR_STORAGE 


TYPE_SIG_ATOMIC_T



AC_TYPE_SIGNAL



AC_FUNC_SELECT_ARGTYPES



CURL_CHECK_FUNC_RECV
@@ -1643,7 +1645,7 @@ CURL_CHECK_MSG_NOSIGNAL 


dnl Checks for library functions.

dnl AC_PROG_GCC_TRADITIONAL

AC_TYPE_SIGNAL



dnl AC_FUNC_VPRINTF

case $host in

  *msdosdjgpp)