From 74e5beab9dbeb0e893754b8c21679527b5b7e178 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 24 Nov 2005 10:22:46 +0000 Subject: Doug Kaufman's set of patches to make curl build fine on DJGPP again using configure. --- lib/setup.h | 3 +++ lib/transfer.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/setup.h b/lib/setup.h index bebe4e85a..2c74f5118 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -200,6 +200,7 @@ typedef unsigned char bool; #define sread(x,y,z) read_s(x,y,z) #define swrite(x,y,z) write_s(x,y,z) #define select(n,r,w,x,t) select_s(n,r,w,x,t) +#define ioctl(x,y,z) ioctlsocket(x,y,(char *)(z)) #define IOCTL_3_ARGS #include #ifdef word @@ -229,7 +230,9 @@ typedef unsigned char bool; #endif #define DIR_CHAR "/" +#ifndef DOT_CHAR #define DOT_CHAR "." +#endif #ifdef DJGPP #undef DOT_CHAR diff --git a/lib/transfer.c b/lib/transfer.c index 11a8f8463..f84594a9e 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -214,7 +214,7 @@ CURLcode Curl_readrewind(struct connectdata *conn) if(data->set.ioctl) { curlioerr err; - err = data->set.ioctl(data, CURLIOCMD_RESTARTREAD, + err = (data->set.ioctl) (data, CURLIOCMD_RESTARTREAD, data->set.ioctl_client); infof(data, "the ioctl callback returned %d\n", (int)err); -- cgit v1.2.3