diff options
author | Yang Tse <yangsita@gmail.com> | 2008-07-17 03:07:54 +0000 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2008-07-17 03:07:54 +0000 |
commit | 39f23aec6b3cd5e7e5dd9077d96f8eff37ff2b19 (patch) | |
tree | 99b4fdb88e20b8235bf1ff38672985c3f0ed7795 /lib | |
parent | 362422641e15aa500991ab8508eb0c10cf86b1e5 (diff) | |
download | curl-39f23aec6b3cd5e7e5dd9077d96f8eff37ff2b19.tar.gz |
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.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Makefile.netware | 12 | ||||
-rw-r--r-- | lib/config-amigaos.h | 6 | ||||
-rw-r--r-- | lib/config-mac.h | 6 | ||||
-rw-r--r-- | lib/config-os400.h | 12 | ||||
-rw-r--r-- | lib/config-riscos.h | 12 | ||||
-rw-r--r-- | lib/config-symbian.h | 6 | ||||
-rw-r--r-- | lib/config-tpf.h | 12 | ||||
-rw-r--r-- | lib/config-win32.h | 12 | ||||
-rw-r--r-- | lib/config-win32ce.h | 12 | ||||
-rw-r--r-- | lib/config.dos | 6 | ||||
-rw-r--r-- | lib/setup_once.h | 12 |
11 files changed, 54 insertions, 54 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 9d71b6d8e..6e0aac995 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -383,11 +383,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) >> $@ @@ -422,11 +422,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) >> $@ diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h index 553a910aa..fe77a2dc4 100644 --- a/lib/config-amigaos.h +++ b/lib/config-amigaos.h @@ -133,11 +133,11 @@ #define HAVE_RECVFROM 1 #define RECVFROM_TYPE_ARG1 long -#define RECVFROM_TYPE_ARG2 char * +#define RECVFROM_TYPE_ARG2 char #define RECVFROM_TYPE_ARG3 long #define RECVFROM_TYPE_ARG4 long -#define RECVFROM_TYPE_ARG5 struct sockaddr * -#define RECVFROM_TYPE_ARG6 long * +#define RECVFROM_TYPE_ARG5 struct sockaddr +#define RECVFROM_TYPE_ARG6 long #define RECVFROM_TYPE_RETV long #define HAVE_SEND 1 diff --git a/lib/config-mac.h b/lib/config-mac.h index 9769f9dfe..d5c143c4f 100644 --- a/lib/config-mac.h +++ b/lib/config-mac.h @@ -65,11 +65,11 @@ #define HAVE_RECVFROM 1 #define RECVFROM_TYPE_ARG1 int -#define RECVFROM_TYPE_ARG2 void * +#define RECVFROM_TYPE_ARG2 void #define RECVFROM_TYPE_ARG3 size_t #define RECVFROM_TYPE_ARG4 int -#define RECVFROM_TYPE_ARG5 struct sockaddr * -#define RECVFROM_TYPE_ARG6 int * +#define RECVFROM_TYPE_ARG5 struct sockaddr +#define RECVFROM_TYPE_ARG6 int #define RECVFROM_TYPE_RETV ssize_t #define HAVE_SEND 1 diff --git a/lib/config-os400.h b/lib/config-os400.h index 20785665c..f5ca8a2d7 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -462,8 +462,8 @@ /* Define to the type of arg 1 for recvfrom. */ #define RECVFROM_TYPE_ARG1 int -/* Define to the type of arg 2 for recvfrom. */ -#define RECVFROM_TYPE_ARG2 char * +/* Define to the type pointed by arg 2 for recvfrom. */ +#define RECVFROM_TYPE_ARG2 char /* Define to the type of arg 3 for recvfrom. */ #define RECVFROM_TYPE_ARG3 int @@ -471,11 +471,11 @@ /* Define to the type of arg 4 for recvfrom. */ #define RECVFROM_TYPE_ARG4 int -/* Define to the type of arg 5 for recvfrom. */ -#define RECVFROM_TYPE_ARG5 struct sockaddr * +/* Define to the type pointed by arg 5 for recvfrom. */ +#define RECVFROM_TYPE_ARG5 struct sockaddr -/* Define to the type of arg 6 for recvfrom. */ -#define RECVFROM_TYPE_ARG6 int * +/* Define to the type pointed by arg 6 for recvfrom. */ +#define RECVFROM_TYPE_ARG6 int /* Define to the function return type for recvfrom. */ #define RECVFROM_TYPE_RETV int diff --git a/lib/config-riscos.h b/lib/config-riscos.h index 722e8734f..7140e9c24 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -436,8 +436,8 @@ /* Define to the type of arg 1 for recvfrom. */ #define RECVFROM_TYPE_ARG1 int -/* Define to the type of arg 2 for recvfrom. */ -#define RECVFROM_TYPE_ARG2 void * +/* Define to the type pointed by arg 2 for recvfrom. */ +#define RECVFROM_TYPE_ARG2 void /* Define to the type of arg 3 for recvfrom. */ #define RECVFROM_TYPE_ARG3 size_t @@ -445,11 +445,11 @@ /* Define to the type of arg 4 for recvfrom. */ #define RECVFROM_TYPE_ARG4 int -/* Define to the type of arg 5 for recvfrom. */ -#define RECVFROM_TYPE_ARG5 struct sockaddr * +/* Define to the type pointed by arg 5 for recvfrom. */ +#define RECVFROM_TYPE_ARG5 struct sockaddr -/* Define to the type of arg 6 for recvfrom. */ -#define RECVFROM_TYPE_ARG6 int * +/* Define to the type pointed by arg 6 for recvfrom. */ +#define RECVFROM_TYPE_ARG6 int /* Define to the function return type for recvfrom. */ #define RECVFROM_TYPE_RETV ssize_t diff --git a/lib/config-symbian.h b/lib/config-symbian.h index 2297b9f73..b7467dbd9 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -684,11 +684,11 @@ #define RECV_TYPE_RETV ssize_t #define RECVFROM_TYPE_ARG1 int -#define RECVFROM_TYPE_ARG2 void* +#define RECVFROM_TYPE_ARG2 void #define RECVFROM_TYPE_ARG3 size_t #define RECVFROM_TYPE_ARG4 int -#define RECVFROM_TYPE_ARG5 struct sockaddr * -#define RECVFROM_TYPE_ARG6 size_t * +#define RECVFROM_TYPE_ARG5 struct sockaddr +#define RECVFROM_TYPE_ARG6 size_t #define RECVFROM_TYPE_RETV ssize_t #define SEND_TYPE_ARG1 int diff --git a/lib/config-tpf.h b/lib/config-tpf.h index 1d114b9ce..dbeabf6b1 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -708,8 +708,8 @@ /* Define to the type of arg 1 for recvfrom. */ #define RECVFROM_TYPE_ARG1 int -/* Define to the type of arg 2 for recvfrom. */ -#define RECVFROM_TYPE_ARG2 char * +/* Define to the type pointed by arg 2 for recvfrom. */ +#define RECVFROM_TYPE_ARG2 char /* Define to the type of arg 3 for recvfrom. */ #define RECVFROM_TYPE_ARG3 int @@ -717,11 +717,11 @@ /* Define to the type of arg 4 for recvfrom. */ #define RECVFROM_TYPE_ARG4 int -/* Define to the type of arg 5 for recvfrom. */ -#define RECVFROM_TYPE_ARG5 struct sockaddr * +/* Define to the type pointed by arg 5 for recvfrom. */ +#define RECVFROM_TYPE_ARG5 struct sockaddr -/* Define to the type of arg 6 for recvfrom. */ -#define RECVFROM_TYPE_ARG6 int * +/* Define to the type pointed by arg 6 for recvfrom. */ +#define RECVFROM_TYPE_ARG6 int /* Define to the function return type for recvfrom. */ #define RECVFROM_TYPE_RETV int diff --git a/lib/config-win32.h b/lib/config-win32.h index d51047526..6526f5497 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -254,8 +254,8 @@ /* Define to the type of arg 1 for recvfrom. */ #define RECVFROM_TYPE_ARG1 SOCKET -/* Define to the type of arg 2 for recvfrom. */ -#define RECVFROM_TYPE_ARG2 char * +/* Define to the type pointed by arg 2 for recvfrom. */ +#define RECVFROM_TYPE_ARG2 char /* Define to the type of arg 3 for recvfrom. */ #define RECVFROM_TYPE_ARG3 int @@ -263,11 +263,11 @@ /* Define to the type of arg 4 for recvfrom. */ #define RECVFROM_TYPE_ARG4 int -/* Define to the type of arg 5 for recvfrom. */ -#define RECVFROM_TYPE_ARG5 struct sockaddr * +/* Define to the type pointed by arg 5 for recvfrom. */ +#define RECVFROM_TYPE_ARG5 struct sockaddr -/* Define to the type of arg 6 for recvfrom. */ -#define RECVFROM_TYPE_ARG6 int * +/* Define to the type pointed by arg 6 for recvfrom. */ +#define RECVFROM_TYPE_ARG6 int /* Define to the function return type for recvfrom. */ #define RECVFROM_TYPE_RETV int diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index c9b9bea38..347b78cbe 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -240,8 +240,8 @@ /* Define to the type of arg 1 for recvfrom. */ #define RECVFROM_TYPE_ARG1 SOCKET -/* Define to the type of arg 2 for recvfrom. */ -#define RECVFROM_TYPE_ARG2 char * +/* Define to the type pointed by arg 2 for recvfrom. */ +#define RECVFROM_TYPE_ARG2 char /* Define to the type of arg 3 for recvfrom. */ #define RECVFROM_TYPE_ARG3 int @@ -249,11 +249,11 @@ /* Define to the type of arg 4 for recvfrom. */ #define RECVFROM_TYPE_ARG4 int -/* Define to the type of arg 5 for recvfrom. */ -#define RECVFROM_TYPE_ARG5 struct sockaddr * +/* Define to the type pointed by arg 5 for recvfrom. */ +#define RECVFROM_TYPE_ARG5 struct sockaddr -/* Define to the type of arg 6 for recvfrom. */ -#define RECVFROM_TYPE_ARG6 int * +/* Define to the type pointed by arg 6 for recvfrom. */ +#define RECVFROM_TYPE_ARG6 int /* Define to the function return type for recvfrom. */ #define RECVFROM_TYPE_RETV int diff --git a/lib/config.dos b/lib/config.dos index 7d317b846..9669bdb21 100644 --- a/lib/config.dos +++ b/lib/config.dos @@ -80,11 +80,11 @@ #define RECV_TYPE_RETV int #define RECVFROM_TYPE_ARG1 int -#define RECVFROM_TYPE_ARG2 void * +#define RECVFROM_TYPE_ARG2 void #define RECVFROM_TYPE_ARG3 int #define RECVFROM_TYPE_ARG4 int -#define RECVFROM_TYPE_ARG5 struct sockaddr * -#define RECVFROM_TYPE_ARG6 int * +#define RECVFROM_TYPE_ARG5 struct sockaddr +#define RECVFROM_TYPE_ARG6 int #define RECVFROM_TYPE_RETV int #define BSD diff --git a/lib/setup_once.h b/lib/setup_once.h index 77b253588..0e2d8bc12 100644 --- a/lib/setup_once.h +++ b/lib/setup_once.h @@ -213,12 +213,12 @@ struct timeval { Error Missing_definition_of_return_and_arguments_types_of_recvfrom /* */ #else -#define sreadfrom(s,b,bl,f,fl) (ssize_t)recvfrom((RECVFROM_TYPE_ARG1)(s), \ - (RECVFROM_TYPE_ARG2)(b), \ - (RECVFROM_TYPE_ARG3)(bl), \ - (RECVFROM_TYPE_ARG4)(0), \ - (RECVFROM_TYPE_ARG5)(f), \ - (RECVFROM_TYPE_ARG6)(fl)) +#define sreadfrom(s,b,bl,f,fl) (ssize_t)recvfrom((RECVFROM_TYPE_ARG1) (s), \ + (RECVFROM_TYPE_ARG2 *)(b), \ + (RECVFROM_TYPE_ARG3) (bl), \ + (RECVFROM_TYPE_ARG4) (0), \ + (RECVFROM_TYPE_ARG5 *)(f), \ + (RECVFROM_TYPE_ARG6 *)(fl)) #endif #else /* HAVE_RECVFROM */ #ifndef sreadfrom |