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

fix: remove need and definition of HAVE_SOCKLEN_T symbol

parent 0163b5b8

acinclude.m4

+0 −4
Original line number Diff line number Diff line
@@ -775,8 +775,6 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [ 
  AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl

  AC_CHECK_TYPE([socklen_t], [

    dnl socklen_t is available

    AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,

      [Define to 1 if socklen_t is available or a equivalent is defined.])

  ],[

    dnl socklen_t not available

    AC_CACHE_CHECK([for socklen_t equivalent],
@@ -830,8 +828,6 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [ 
      *)

        AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,

          [Type to use in place of socklen_t when system does not provide it.])

        AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,

          [Define to 1 if socklen_t is available or a equivalent is defined.])

        ;;

    esac

  ],[

ares/acinclude.m4

+0 −4
Original line number Diff line number Diff line
@@ -244,8 +244,6 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [ 
  AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl

  AC_CHECK_TYPE([socklen_t], [

    dnl socklen_t is available

    AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,

      [Define to 1 if socklen_t is available or a equivalent is defined.])

  ],[

    dnl socklen_t not available

    AC_CACHE_CHECK([for socklen_t equivalent],
@@ -299,8 +297,6 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [ 
      *)

        AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,

          [Type to use in place of socklen_t when system does not provide it.])

        AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,

          [Define to 1 if socklen_t is available or a equivalent is defined.])

        ;;

    esac

  ],[

ares/setup_once.h

+1 −2
Original line number Diff line number Diff line
@@ -100,11 +100,10 @@ struct timeval { 
 * definition is present the other one also is available.

 */



#if defined(WIN32) && !defined(HAVE_SOCKLEN_T)

#if defined(WIN32) && !defined(HAVE_CONFIG_H)

#  if ( defined(_MSC_VER) && !defined(INET_ADDRSTRLEN) ) || \

      (!defined(_MSC_VER) && !defined(HAVE_WS2TCPIP_H) )

#    define socklen_t int

#    define HAVE_SOCKLEN_T

#  endif

#endif

lib/setup_once.h

+1 −2
Original line number Diff line number Diff line
@@ -107,11 +107,10 @@ struct timeval { 
 * definition is present the other one also is available.

 */



#if defined(WIN32) && !defined(HAVE_SOCKLEN_T)

#if defined(WIN32) && !defined(HAVE_CONFIG_H)

#  if ( defined(_MSC_VER) && !defined(INET_ADDRSTRLEN) ) || \

      (!defined(_MSC_VER) && !defined(HAVE_WS2TCPIP_H) )

#    define socklen_t int

#    define HAVE_SOCKLEN_T

#  endif

#endif