diff options
| author | Gisle Vanem <gvanem@broadpark.no> | 2006-10-27 14:07:32 +0000 |
|---|---|---|
| committer | Gisle Vanem <gvanem@broadpark.no> | 2006-10-27 14:07:32 +0000 |
| commit | 812ce0d93ff087da2b776600f37928e4a10c5509 (patch) | |
| tree | 0d073b2442a36328a4717eb7149ced70ce097127 | |
| parent | bbae5b49f9b25be7e54a0b8388700091bfa6d825 (diff) | |
| download | gnurl-812ce0d93ff087da2b776600f37928e4a10c5509.tar.gz gnurl-812ce0d93ff087da2b776600f37928e4a10c5509.tar.bz2 gnurl-812ce0d93ff087da2b776600f37928e4a10c5509.zip | |
Get rid of the special sread()+swrite() for MSDOS. Use recv()
and send(). Added needed HAVE_x defines.
| -rw-r--r-- | lib/config.dos | 13 | ||||
| -rw-r--r-- | lib/setup_once.h | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/lib/config.dos b/lib/config.dos index 709632a11..67d12d0b7 100644 --- a/lib/config.dos +++ b/lib/config.dos @@ -44,7 +44,9 @@ #define HAVE_NET_IF_H 1 #define HAVE_PROCESS_H 1 #define HAVE_PERROR 1 +#define HAVE_RECV 1 #define HAVE_SELECT 1 +#define HAVE_SEND 1 #define HAVE_SETJMP_H 1 #define HAVE_SETLOCALE 1 #define HAVE_SETVBUF 1 @@ -75,10 +77,21 @@ #define STDC_HEADERS 1 #define TIME_WITH_SYS_TIME 1 +/* Qualifiers for send() and recv(). + */ +#define SEND_TYPE_ARG1 int +#define SEND_QUAL_ARG2 const +#define SEND_TYPE_ARG2 char * +#define SEND_TYPE_ARG3 int +#define SEND_TYPE_ARG4 int +#define SEND_TYPE_RETV int + #define RECV_TYPE_ARG1 int #define RECV_TYPE_ARG2 char * #define RECV_TYPE_ARG3 int #define RECV_TYPE_ARG4 int +#define RECV_TYPE_RETV int + #define BSD diff --git a/lib/setup_once.h b/lib/setup_once.h index 5573cbcb2..04640707c 100644 --- a/lib/setup_once.h +++ b/lib/setup_once.h @@ -84,9 +84,6 @@ (RECV_TYPE_ARG4)(SEND_4TH_ARG)) #endif #else /* HAVE_RECV */ -#ifdef MSDOS -#define sread(x,y,z) (ssize_t)read_s((int)(x), (char *)(y), (int)(z)) -#endif #ifndef sread /* */ Error Missing_definition_of_macro_sread @@ -111,9 +108,6 @@ (SEND_TYPE_ARG4)(SEND_4TH_ARG)) #endif #else /* HAVE_SEND */ -#ifdef MSDOS -#define swrite(x,y,z) (ssize_t)write_s((int)(x), (char *)(y), (int)(z)) -#endif #ifndef swrite /* */ Error Missing_definition_of_macro_swrite |