diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | Makefile.dj | 3 | ||||
| -rw-r--r-- | Makefile.netware | 1 | ||||
| -rw-r--r-- | acinclude.m4 | 13 |
4 files changed, 21 insertions, 1 deletions
@@ -1,5 +1,10 @@ Changelog for the c-ares project +* Jul 20 2008 (Yang Tse) +- when recvfrom prototype uses a void pointer for arguments 2, 5 or 6 this will + now cause the definition, as appropriate, of RECVFROM_TYPE_ARG2_IS_VOID, + RECVFROM_TYPE_ARG5_IS_VOID or RECVFROM_TYPE_ARG6_IS_VOID. + * 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. diff --git a/Makefile.dj b/Makefile.dj index 5143928..dd20dc5 100644 --- a/Makefile.dj +++ b/Makefile.dj @@ -27,7 +27,8 @@ CFLAGS += -DWATT32 -DHAVE_AF_INET6 -DHAVE_PF_INET6 -DHAVE_IOCTLSOCKET \ -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_ARG5='struct sockaddr' -DHAVE_RECVFROM \ + -DRECVFROM_TYPE_ARG2_IS_VOID LDFLAGS = -s diff --git a/Makefile.netware b/Makefile.netware index e8a8a26..d82a9cd 100644 --- a/Makefile.netware +++ b/Makefile.netware @@ -338,6 +338,7 @@ else @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 RECVFROM_TYPE_ARG2_IS_VOID 1$(DL) >> $@ @echo $(DL)#define SEND_QUAL_ARG2$(DL) >> $@ @echo $(DL)#define SEND_TYPE_ARG1 int$(DL) >> $@ @echo $(DL)#define SEND_TYPE_ARG2 void *$(DL) >> $@ diff --git a/acinclude.m4 b/acinclude.m4 index 39154ab..bea042e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1206,6 +1206,19 @@ AC_DEFUN([CURL_CHECK_FUNC_RECVFROM], [ AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG6, $recvfrom_type_arg6, [Define to the type pointed by arg 6 for recvfrom.]) # + if test "$recvfrom_type_arg2" = "void"; then + AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG2_IS_VOID, 1, + [Define to 1 if the type pointed by arg 2 for recvfrom is void.]) + fi + if test "$recvfrom_type_arg5" = "void"; then + AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG5_IS_VOID, 1, + [Define to 1 if the type pointed by arg 5 for recvfrom is void.]) + fi + if test "$recvfrom_type_arg6" = "void"; then + AC_DEFINE_UNQUOTED(RECVFROM_TYPE_ARG6_IS_VOID, 1, + [Define to 1 if the type pointed by arg 6 for recvfrom is void.]) + fi + # case $prev_sh_opts in *f*) ;; |