Commit 39f23aec authored by Yang Tse's avatar Yang Tse
Browse files

RECVFROM_TYPE_ARG2, RECVFROM_TYPE_ARG5 and RECVFROM_TYPE_ARG6 are now defined 

to the data type pointed by its respective argument and not the pointer type.
parent 36242264

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 


                                  Changelog



Yang Tse (17 Jul 2008)

- RECVFROM_TYPE_ARG2, RECVFROM_TYPE_ARG5 and RECVFROM_TYPE_ARG6 are now defined

  to the data type pointed by its respective argument and not the pointer type.



Yang Tse (16 Jul 2008)

- Configure process now checks availability of recvfrom() socket function and

  finds out its return type and the types of its arguments. Added definitions

acinclude.m4

+35 −6
Original line number Diff line number Diff line
@@ -1591,6 +1591,8 @@ dnl will be defined, defining the types of the arguments 
dnl in RECVFROM_TYPE_ARG1, RECVFROM_TYPE_ARG2, and so on

dnl to RECVFROM_TYPE_ARG6, defining also the type of the

dnl function return value in RECVFROM_TYPE_RETV.

dnl Notice that the types returned for pointer arguments

dnl will actually be the type pointed by the pointer.



AC_DEFUN([CURL_CHECK_FUNC_RECVFROM], [

  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
@@ -1703,21 +1705,48 @@ AC_DEFUN([CURL_CHECK_FUNC_RECVFROM], [ 
      IFS=$recvfrom_prev_IFS

      shift

      #

      recvfrom_ptrt_arg2=$[2]

      recvfrom_ptrt_arg5=$[5]

      recvfrom_ptrt_arg6=$[6]

      #

      AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG1, $[1],

        [Define to the type of arg 1 for recvfrom.])

      AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG2, $[2],

        [Define to the type of arg 2 for recvfrom.])

      AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG3, $[3],

        [Define to the type of arg 3 for recvfrom.])

      AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG4, $[4],

        [Define to the type of arg 4 for recvfrom.])

      AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG5, $[5],

        [Define to the type of arg 5 for recvfrom.])

      AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG6, $[6],

        [Define to the type of arg 6 for recvfrom.])

      AC_DEFINE_UNQUOTED(RECVFROM_TYPE_RETV, $[7],

        [Define to the function return type for recvfrom.])

      #

      prev_sh_opts=$-

      #

      case $prev_sh_opts in

        *f*)

          ;;

        *)

          set -f

          ;;

      esac

      #

      recvfrom_type_arg2=`echo $recvfrom_ptrt_arg2 | sed 's/ \*//'`

      recvfrom_type_arg5=`echo $recvfrom_ptrt_arg5 | sed 's/ \*//'`

      recvfrom_type_arg6=`echo $recvfrom_ptrt_arg6 | sed 's/ \*//'`

      #

      AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG2, $recvfrom_type_arg2,

        [Define to the type pointed by arg 2 for recvfrom.])

      AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG5, $recvfrom_type_arg5,

        [Define to the type pointed by arg 5 for recvfrom.])

      AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG6, $recvfrom_type_arg6,

        [Define to the type pointed by arg 6 for recvfrom.])

      #

      case $prev_sh_opts in

        *f*)

          ;;

        *)

          set +f

          ;;

      esac

      #

      AC_DEFINE_UNQUOTED(HAVE_RECVFROM, 1,

        [Define to 1 if you have the recvfrom function.])

      ac_cv_func_recvfrom="yes"

ares/CHANGES

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



* Jul 17 2008 (Yang Tse)

- RECVFROM_TYPE_ARG2, RECVFROM_TYPE_ARG5 and RECVFROM_TYPE_ARG6 are now defined

  to the data type pointed by its respective argument and not the pointer type.



* Jul 16 2008 (Yang Tse)

- Improved configure detection of number of arguments for getservbyport_r.

  Detection is now based on compilation checks instead of linker ones.

ares/Makefile.dj

+4 −4
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ CFLAGS += -DWATT32 -DHAVE_AF_INET6 -DHAVE_PF_INET6 -DHAVE_IOCTLSOCKET \ 
          -DRECV_TYPE_ARG3='int'   -DRECV_TYPE_ARG4='int' \

          -DRECV_TYPE_RETV='int'   -DHAVE_STRUCT_TIMEVAL \

          -Dselect=select_s        -Dsocklen_t=int -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_ARG6='int*' -DRECVFROM_TYPE_RETV='int' \

          -DRECVFROM_TYPE_ARG5='struct sockaddr*' -DHAVE_RECVFROM

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

          -DRECVFROM_TYPE_ARG5='struct sockaddr' -DHAVE_RECVFROM



LDFLAGS = -s

ares/Makefile.netware

+6 −6
Original line number Diff line number Diff line
@@ -289,11 +289,11 @@ ifeq ($(LIBARCH),CLIB) 
	@echo $(DL)#define RECV_TYPE_ARG4 int$(DL) >> $@

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

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

	@echo $(DL)#define RECVFROM_TYPE_ARG2 char *$(DL) >> $@

	@echo $(DL)#define RECVFROM_TYPE_ARG2 char$(DL) >> $@

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

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

	@echo $(DL)#define RECVFROM_TYPE_ARG5 struct sockaddr *$(DL) >> $@

	@echo $(DL)#define RECVFROM_TYPE_ARG6 int *$(DL) >> $@

	@echo $(DL)#define RECVFROM_TYPE_ARG5 struct sockaddr$(DL) >> $@

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

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

	@echo $(DL)#define SEND_QUAL_ARG2$(DL) >> $@

	@echo $(DL)#define SEND_TYPE_ARG1 int$(DL) >> $@
@@ -332,11 +332,11 @@ else 
	@echo $(DL)#define RECV_TYPE_ARG4 int$(DL) >> $@

	@echo $(DL)#define RECV_TYPE_RETV ssize_t$(DL) >> $@

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

	@echo $(DL)#define RECVFROM_TYPE_ARG2 void *$(DL) >> $@

	@echo $(DL)#define RECVFROM_TYPE_ARG2 void$(DL) >> $@

	@echo $(DL)#define RECVFROM_TYPE_ARG3 size_t$(DL) >> $@

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

	@echo $(DL)#define RECVFROM_TYPE_ARG5 struct sockaddr *$(DL) >> $@

	@echo $(DL)#define RECVFROM_TYPE_ARG6 int *$(DL) >> $@

	@echo $(DL)#define RECVFROM_TYPE_ARG5 struct sockaddr$(DL) >> $@

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

	@echo $(DL)#define RECVFROM_TYPE_RETV ssize_t$(DL) >> $@

	@echo $(DL)#define SEND_QUAL_ARG2$(DL) >> $@

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