diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | acinclude.m4 | 13 | ||||
| -rw-r--r-- | ares/CHANGES | 5 | ||||
| -rw-r--r-- | ares/Makefile.dj | 3 | ||||
| -rw-r--r-- | ares/Makefile.netware | 1 | ||||
| -rw-r--r-- | ares/acinclude.m4 | 13 | ||||
| -rw-r--r-- | lib/Makefile.netware | 1 | ||||
| -rw-r--r-- | lib/config-mac.h | 1 | ||||
| -rw-r--r-- | lib/config-riscos.h | 3 | ||||
| -rw-r--r-- | lib/config-symbian.h | 1 | ||||
| -rw-r--r-- | lib/config.dos | 1 | ||||
| -rw-r--r-- | packages/vms/config-vms.h | 3 | ||||
| -rw-r--r-- | src/Makefile.netware | 1 |
13 files changed, 50 insertions, 1 deletions
@@ -6,6 +6,11 @@ Changelog +Yang Tse (20 Jul 2008) +- 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. + 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. diff --git a/acinclude.m4 b/acinclude.m4 index 48150459f..743fcda08 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1739,6 +1739,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*) ;; diff --git a/ares/CHANGES b/ares/CHANGES index 88662236a..b35a593d4 100644 --- a/ares/CHANGES +++ b/ares/CHANGES @@ -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/ares/Makefile.dj b/ares/Makefile.dj index 51439284b..dd20dc542 100644 --- a/ares/Makefile.dj +++ b/ares/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/ares/Makefile.netware b/ares/Makefile.netware index e8a8a26c5..d82a9cd76 100644 --- a/ares/Makefile.netware +++ b/ares/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/ares/acinclude.m4 b/ares/acinclude.m4 index 39154abfc..bea042ea8 100644 --- a/ares/acinclude.m4 +++ b/ares/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*) ;; diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 6e0aac995..07718e0a0 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -428,6 +428,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/lib/config-mac.h b/lib/config-mac.h index d5c143c4f..e6d2130a5 100644 --- a/lib/config-mac.h +++ b/lib/config-mac.h @@ -71,6 +71,7 @@ #define RECVFROM_TYPE_ARG5 struct sockaddr #define RECVFROM_TYPE_ARG6 int #define RECVFROM_TYPE_RETV ssize_t +#define RECVFROM_TYPE_ARG2_IS_VOID 1 #define HAVE_SEND 1 #define SEND_TYPE_ARG1 int diff --git a/lib/config-riscos.h b/lib/config-riscos.h index 7140e9c24..86ef864e3 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -439,6 +439,9 @@ /* Define to the type pointed by arg 2 for recvfrom. */ #define RECVFROM_TYPE_ARG2 void +/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */ +#define RECVFROM_TYPE_ARG2_IS_VOID 1 + /* Define to the type of arg 3 for recvfrom. */ #define RECVFROM_TYPE_ARG3 size_t diff --git a/lib/config-symbian.h b/lib/config-symbian.h index b7467dbd9..0c8a1716e 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -690,6 +690,7 @@ #define RECVFROM_TYPE_ARG5 struct sockaddr #define RECVFROM_TYPE_ARG6 size_t #define RECVFROM_TYPE_RETV ssize_t +#define RECVFROM_TYPE_ARG2_IS_VOID 1 #define SEND_TYPE_ARG1 int #define SEND_QUAL_ARG2 const diff --git a/lib/config.dos b/lib/config.dos index 9669bdb21..76b30debd 100644 --- a/lib/config.dos +++ b/lib/config.dos @@ -86,6 +86,7 @@ #define RECVFROM_TYPE_ARG5 struct sockaddr #define RECVFROM_TYPE_ARG6 int #define RECVFROM_TYPE_RETV int +#define RECVFROM_TYPE_ARG2_IS_VOID 1 #define BSD diff --git a/packages/vms/config-vms.h b/packages/vms/config-vms.h index aacd3b0c3..84090106e 100644 --- a/packages/vms/config-vms.h +++ b/packages/vms/config-vms.h @@ -324,6 +324,9 @@ /* Define to the type pointed by arg 2 for recvfrom. */ #define RECVFROM_TYPE_ARG2 void +/* Define if the type pointed by arg 2 for recvfrom is void. */ +#define RECVFROM_TYPE_ARG2_IS_VOID 1 + /* Define to the type of arg 3 for recvfrom. */ #define RECVFROM_TYPE_ARG3 int diff --git a/src/Makefile.netware b/src/Makefile.netware index 1cc08392a..9dbdf4f41 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -411,6 +411,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) >> $@ |