Unverified Commit 25d287d1 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

configure: remove CURL_CONFIGURE_CURL_SOCKLEN_T 

Follow-up to #3166 which did the cmake part of this. This type/define is
not used.

Closes #3168
parent b04e6240

acinclude.m4

+0 −124
Original line number Diff line number Diff line
@@ -1776,130 +1776,6 @@ cat >>confdefs.h <<_EOF 
_EOF

])





dnl CURL_CONFIGURE_CURL_SOCKLEN_T

dnl -------------------------------------------------

dnl The need for the curl_socklen_t definition arises mainly to properly

dnl interface HP-UX systems which on one hand have a typedef'ed socklen_t

dnl data type which is 32 or 64-Bit wide depending on the data model being

dnl used, and that on the other hand is only actually used when interfacing

dnl the X/Open sockets provided in the xnet library.



AC_DEFUN([CURL_CONFIGURE_CURL_SOCKLEN_T], [

  AC_REQUIRE([CURL_INCLUDES_WS2TCPIP])dnl

  AC_REQUIRE([CURL_INCLUDES_SYS_SOCKET])dnl

  AC_REQUIRE([CURL_PREPROCESS_CALLCONV])dnl

  #

  AC_BEFORE([$0], [CURL_CONFIGURE_PULL_SYS_POLL])dnl

  #

  AC_MSG_CHECKING([for curl_socklen_t data type])

  curl_typeof_curl_socklen_t="unknown"

  for arg1 in int SOCKET; do

    for arg2 in 'struct sockaddr' void; do

      for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do

        if test "$curl_typeof_curl_socklen_t" = "unknown"; then

          AC_COMPILE_IFELSE([

            AC_LANG_PROGRAM([[

              $curl_includes_ws2tcpip

              $curl_includes_sys_socket

              $curl_preprocess_callconv

              extern int FUNCALLCONV getpeername($arg1, $arg2 *, $t *);

            ]],[[

              $t *lenptr = 0;

              if(0 != getpeername(0, 0, lenptr))

                return 1;

            ]])

          ],[

            curl_typeof_curl_socklen_t="$t"

          ])

        fi

      done

    done

  done

  for t in socklen_t int; do

    if test "$curl_typeof_curl_socklen_t" = "void"; then

      AC_COMPILE_IFELSE([

        AC_LANG_PROGRAM([[

          $curl_includes_sys_socket

          typedef $t curl_socklen_t;

        ]],[[

          curl_socklen_t dummy;

        ]])

      ],[

        curl_typeof_curl_socklen_t="$t"

      ])

    fi

  done

  AC_MSG_RESULT([$curl_typeof_curl_socklen_t])

  if test "$curl_typeof_curl_socklen_t" = "void" ||

    test "$curl_typeof_curl_socklen_t" = "unknown"; then

    AC_MSG_ERROR([cannot find data type for curl_socklen_t.])

  fi

  #

  AC_MSG_CHECKING([size of curl_socklen_t])

  curl_sizeof_curl_socklen_t="unknown"

  curl_pull_headers_socklen_t="unknown"

  if test "$curl_cv_header_ws2tcpip_h" = "yes"; then

    tst_pull_header_checks='none ws2tcpip'

    tst_size_checks='4'

  else

    tst_pull_header_checks='none systypes syssocket'

    tst_size_checks='4 8 2'

  fi

  for tst_size in $tst_size_checks; do

    for tst_pull_headers in $tst_pull_header_checks; do

      if test "$curl_sizeof_curl_socklen_t" = "unknown"; then

        case $tst_pull_headers in

          ws2tcpip)

            tmp_includes="$curl_includes_ws2tcpip"

            ;;

          systypes)

            tmp_includes="$curl_includes_sys_types"

            ;;

          syssocket)

            tmp_includes="$curl_includes_sys_socket"

            ;;

          *)

            tmp_includes=""

            ;;

        esac

        AC_COMPILE_IFELSE([

          AC_LANG_PROGRAM([[

            $tmp_includes

            typedef $curl_typeof_curl_socklen_t curl_socklen_t;

            typedef char dummy_arr[sizeof(curl_socklen_t) == $tst_size ? 1 : -1];

          ]],[[

            curl_socklen_t dummy;

          ]])

        ],[

          curl_sizeof_curl_socklen_t="$tst_size"

          curl_pull_headers_socklen_t="$tst_pull_headers"

        ])

      fi

    done

  done

  AC_MSG_RESULT([$curl_sizeof_curl_socklen_t])

  if test "$curl_sizeof_curl_socklen_t" = "unknown"; then

    AC_MSG_ERROR([cannot find out size of curl_socklen_t.])

  fi

  #

  case $curl_pull_headers_socklen_t in

    ws2tcpip)

      CURL_DEFINE_UNQUOTED([CURL_PULL_WS2TCPIP_H])

      ;;

    systypes)

      CURL_DEFINE_UNQUOTED([CURL_PULL_SYS_TYPES_H])

      ;;

    syssocket)

      CURL_DEFINE_UNQUOTED([CURL_PULL_SYS_TYPES_H])

      CURL_DEFINE_UNQUOTED([CURL_PULL_SYS_SOCKET_H])

      ;;

  esac

  CURL_DEFINE_UNQUOTED([CURL_TYPEOF_CURL_SOCKLEN_T], [$curl_typeof_curl_socklen_t])

  CURL_DEFINE_UNQUOTED([CURL_SIZEOF_CURL_SOCKLEN_T], [$curl_sizeof_curl_socklen_t])

])





dnl CURL_CONFIGURE_PULL_SYS_POLL

dnl -------------------------------------------------

dnl The need for the sys/poll.h inclusion arises mainly to properly

configure.ac

+0 −2
Original line number Diff line number Diff line
@@ -3650,8 +3650,6 @@ CURL_RUN_IFELSE( 
  AC_MSG_RESULT([no])

])



CURL_CONFIGURE_CURL_SOCKLEN_T



CURL_CONFIGURE_PULL_SYS_POLL



TYPE_IN_ADDR_T