Commit 80186aa7 authored by Yang Tse's avatar Yang Tse
Browse files

Use build-time configured ares_socklen_t instead of socklen_t

parent 6ac73963

ares/CHANGES

+3 −0
Original line number Original line Diff line number Diff line 
  Changelog for the c-ares project

  Changelog for the c-ares project





* May 2 2009 (Yang Tse)

- Use a build-time configured ares_socklen_t data type instead of socklen_t.



* April 21 2009 (Yang Tse)

* April 21 2009 (Yang Tse)

- Moved potential inclusion of system's malloc.h and memory.h header files to

- Moved potential inclusion of system's malloc.h and memory.h header files to

  setup_once.h.  Inclusion of each header file is based on the definition of

  setup_once.h.  Inclusion of each header file is based on the definition of

ares/Makefile.dj

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ CFLAGS += -DWATT32 -DHAVE_AF_INET6 -DHAVE_PF_INET6 -DHAVE_IOCTLSOCKET \ 
          -DRECV_TYPE_ARG1='int'   -DRECV_TYPE_ARG2='void*' \

          -DRECV_TYPE_ARG1='int'   -DRECV_TYPE_ARG2='void*' \

          -DRECV_TYPE_ARG3='int'   -DRECV_TYPE_ARG4='int' \

          -DRECV_TYPE_ARG3='int'   -DRECV_TYPE_ARG4='int' \

          -DRECV_TYPE_RETV='int'   -DHAVE_STRUCT_TIMEVAL \

          -DRECV_TYPE_RETV='int'   -DHAVE_STRUCT_TIMEVAL \

          -Dselect=select_s        -Dsocklen_t=int -UHAVE_CONFIG_H \

          -Dselect=select_s        -UHAVE_CONFIG_H \

          -DRECVFROM_TYPE_ARG1='int' -DRECVFROM_TYPE_ARG2='void' \

          -DRECVFROM_TYPE_ARG1='int' -DRECVFROM_TYPE_ARG2='void' \

          -DRECVFROM_TYPE_ARG3='int' -DRECVFROM_TYPE_ARG4='int' \

          -DRECVFROM_TYPE_ARG3='int' -DRECVFROM_TYPE_ARG4='int' \

          -DRECVFROM_TYPE_ARG6='int' -DRECVFROM_TYPE_RETV='int' \

          -DRECVFROM_TYPE_ARG6='int' -DRECVFROM_TYPE_RETV='int' \

ares/Makefile.netware

+0 −4
Original line number Original line Diff line number Diff line
@@ -303,7 +303,6 @@ ifeq ($(LIBARCH),CLIB) 
	@echo $(DL)#define SEND_TYPE_ARG3 int$(DL) >> $@

	@echo $(DL)#define SEND_TYPE_ARG3 int$(DL) >> $@

	@echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@

	@echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@

	@echo $(DL)#define SEND_TYPE_RETV int$(DL) >> $@

	@echo $(DL)#define SEND_TYPE_RETV int$(DL) >> $@

	@echo $(DL)#define socklen_t int$(DL) >> $@

else

else

	@echo $(DL)#define OS "i586-pc-libc-NetWare"$(DL) >> $@

	@echo $(DL)#define OS "i586-pc-libc-NetWare"$(DL) >> $@

	@echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@

	@echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@
@@ -407,9 +406,6 @@ endif 
	@echo $(DL)#else$(DL) >> $@

	@echo $(DL)#else$(DL) >> $@

	@echo $(DL)#define HAVE_VARIADIC_MACROS_C99 1$(DL) >> $@

	@echo $(DL)#define HAVE_VARIADIC_MACROS_C99 1$(DL) >> $@

	@echo $(DL)#endif$(DL) >> $@

	@echo $(DL)#endif$(DL) >> $@

ifdef OLD_NOVELLSDK

	@echo $(DL)#define socklen_t int$(DL) >> $@

endif





FORCE: ;

FORCE: ;

ares/RELEASE-NOTES

+2 −1
Original line number Original line Diff line number Diff line
@@ -4,8 +4,9 @@ Changed: 




 o in6_addr is not used in ares.h anymore, but a private ares_in6_addr is

 o in6_addr is not used in ares.h anymore, but a private ares_in6_addr is

   instead declared and used

   instead declared and used

 p ares_gethostbyname() now supports 'AF_UNSPEC' as a family for resolving

 o ares_gethostbyname() now supports 'AF_UNSPEC' as a family for resolving

   either AF_INET6 or AF_INET

   either AF_INET6 or AF_INET

 o a build-time configured ares_socklen_t is now used instead of socklen_t





Fixed:

Fixed:

ares/acinclude.m4

+0 −89
Original line number Original line Diff line number Diff line
@@ -450,94 +450,6 @@ AC_DEFUN([CURL_CHECK_HEADER_MEMORY], [ 
])

])









dnl CURL_CHECK_TYPE_SOCKLEN_T

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

dnl Check for existing socklen_t type, and provide

dnl an equivalent type if socklen_t not available



AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [

  AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl

  AC_CHECK_TYPE([socklen_t], ,[

    dnl socklen_t not available

    AC_CACHE_CHECK([for socklen_t equivalent],

      [curl_cv_socklen_t_equiv], [

      curl_cv_socklen_t_equiv="unknown"

      for arg1 in 'int' 'SOCKET'; do

        for arg2 in "struct sockaddr" void; do

          for t in int size_t unsigned long "unsigned long"; do

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

              AC_COMPILE_IFELSE([

                AC_LANG_PROGRAM([[

#undef inline

#ifdef HAVE_WINDOWS_H

#ifndef WIN32_LEAN_AND_MEAN

#define WIN32_LEAN_AND_MEAN

#endif

#include <windows.h>

#ifdef HAVE_WINSOCK2_H

#include <winsock2.h>

#else

#ifdef HAVE_WINSOCK_H

#include <winsock.h>

#endif

#endif

#define GETPEERNCALLCONV PASCAL

#else

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#define GETPEERNCALLCONV

#endif

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

                ]],[[

                  $t len=0;

                  getpeername(0,0,&len);

                ]])

              ],[

                curl_cv_socklen_t_equiv="$t"

              ])

            fi

          done

        done

      done

    ])

    case "$curl_cv_socklen_t_equiv" in

      unknown)

        AC_MSG_ERROR([Cannot find a type to use in place of 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.])

        ;;

    esac

  ],[

#undef inline

#ifdef HAVE_WINDOWS_H

#ifndef WIN32_LEAN_AND_MEAN

#define WIN32_LEAN_AND_MEAN

#endif

#include <windows.h>

#ifdef HAVE_WINSOCK2_H

#include <winsock2.h>

#ifdef HAVE_WS2TCPIP_H

#include <ws2tcpip.h>

#endif

#endif

#else

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#endif

  ])

])





dnl CURL_CHECK_FUNC_GETNAMEINFO

dnl CURL_CHECK_FUNC_GETNAMEINFO

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

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

dnl Test if the getnameinfo function is available, 

dnl Test if the getnameinfo function is available,
@@ -551,7 +463,6 @@ dnl argument in GETNAMEINFO_QUAL_ARG1. 




AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [

AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [

  AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl

  AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl

  AC_REQUIRE([CURL_CHECK_TYPE_SOCKLEN_T])dnl

  AC_CHECK_HEADERS(sys/types.h sys/socket.h netdb.h)

  AC_CHECK_HEADERS(sys/types.h sys/socket.h netdb.h)

  #

  #

  AC_MSG_CHECKING([for getnameinfo])

  AC_MSG_CHECKING([for getnameinfo])