diff --git a/Makefile.netware b/Makefile.netware index 5ebbc762..6cb00a75 100644 --- a/Makefile.netware +++ b/Makefile.netware @@ -299,9 +299,8 @@ ifeq ($(LIBARCH),CLIB) @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) >> $@ - @echo $(DL)#define SEND_TYPE_ARG2 char *$(DL) >> $@ + @echo $(DL)#define SEND_TYPE_ARG2 const char *$(DL) >> $@ @echo $(DL)#define SEND_TYPE_ARG3 int$(DL) >> $@ @echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@ @echo $(DL)#define SEND_TYPE_RETV int$(DL) >> $@ diff --git a/configure.ac b/configure.ac index 93732468..fa6a0d8a 100644 --- a/configure.ac +++ b/configure.ac @@ -649,7 +649,6 @@ AC_DEFINE_UNQUOTED([RECV_TYPE_ARG4], [ ${recv_type_arg4} ], [ re AC_DEFINE_UNQUOTED([SEND_TYPE_RETV], [ ${send_type_retv} ], [ send() return value ]) AC_DEFINE_UNQUOTED([SEND_TYPE_ARG1], [ ${send_type_arg1} ], [ send() arg1 type ]) AC_DEFINE_UNQUOTED([SEND_TYPE_ARG2], [ ${send_type_arg2} ], [ send() arg2 type ]) -AC_DEFINE_UNQUOTED([SEND_QUAL_ARG2], [ ], [ send() arg2 qualifier ]) AC_DEFINE_UNQUOTED([SEND_TYPE_ARG3], [ ${send_type_arg3} ], [ send() arg3 type ]) AC_DEFINE_UNQUOTED([SEND_TYPE_ARG4], [ ${send_type_arg4} ], [ send() arg4 type ]) diff --git a/src/lib/ares_config.h.cmake b/src/lib/ares_config.h.cmake index ffe4adf2..85d1cfc2 100644 --- a/src/lib/ares_config.h.cmake +++ b/src/lib/ares_config.h.cmake @@ -443,9 +443,6 @@ /* Define to the function return type for recv. */ #define RECV_TYPE_RETV @RECV_TYPE_RETV@ -/* Define to the type qualifier of arg 2 for send. */ -#define SEND_QUAL_ARG2 @SEND_QUAL_ARG2@ - /* Define to the type of arg 1 for send. */ #define SEND_TYPE_ARG1 @SEND_TYPE_ARG1@ diff --git a/src/lib/config-dos.h b/src/lib/config-dos.h index 8200a5b1..0ae57a92 100644 --- a/src/lib/config-dos.h +++ b/src/lib/config-dos.h @@ -39,8 +39,7 @@ /* Qualifiers for send(), recv(), recvfrom() and getnameinfo(). */ #define SEND_TYPE_ARG1 int -#define SEND_QUAL_ARG2 const -#define SEND_TYPE_ARG2 void * +#define SEND_TYPE_ARG2 const void * #define SEND_TYPE_ARG3 int #define SEND_TYPE_ARG4 int #define SEND_TYPE_RETV int diff --git a/src/lib/config-win32.h b/src/lib/config-win32.h index f7bdb9e8..da5c7483 100644 --- a/src/lib/config-win32.h +++ b/src/lib/config-win32.h @@ -190,11 +190,8 @@ /* Define to the type of arg 1 for send. */ #define SEND_TYPE_ARG1 SOCKET -/* Define to the type qualifier of arg 2 for send. */ -#define SEND_QUAL_ARG2 const - /* Define to the type of arg 2 for send. */ -#define SEND_TYPE_ARG2 char * +#define SEND_TYPE_ARG2 const char * /* Define to the type of arg 3 for send. */ #define SEND_TYPE_ARG3 int diff --git a/src/lib/setup_once.h b/src/lib/setup_once.h index 649d6ac4..95c12d46 100644 --- a/src/lib/setup_once.h +++ b/src/lib/setup_once.h @@ -152,7 +152,7 @@ struct timeval { * which is used to write outgoing data on a connected socket. * If yours has another name then don't define HAVE_SEND. * - * If HAVE_SEND is defined then SEND_TYPE_ARG1, SEND_QUAL_ARG2, + * If HAVE_SEND is defined then SEND_TYPE_ARG1, * SEND_TYPE_ARG2, SEND_TYPE_ARG3, SEND_TYPE_ARG4 and * SEND_TYPE_RETV must also be defined. */ @@ -184,7 +184,7 @@ Error Missing_definition_of_macro_sread write((SEND_TYPE_ARG1)(x), (SEND_TYPE_ARG2)(y), (SEND_TYPE_ARG3)(z)) #elif defined(HAVE_SEND) -# if !defined(SEND_TYPE_ARG1) || !defined(SEND_QUAL_ARG2) || \ +# if !defined(SEND_TYPE_ARG1) || \ !defined(SEND_TYPE_ARG2) || !defined(SEND_TYPE_ARG3) || \ !defined(SEND_TYPE_ARG4) || !defined(SEND_TYPE_RETV) /* */