--- configure.ac.ori	2005-10-11 05:04:18.000000000 -0800
+++ configure.ac	2005-11-20 18:52:26.000000000 -0800
@@ -1504,6 +1504,11 @@
 dnl AC_PROG_GCC_TRADITIONAL
 AC_TYPE_SIGNAL
 dnl AC_FUNC_VPRINTF
+case $host in
+  *msdosdjgpp)
+     ac_cv_func_pipe=no
+    ;;
+esac
 AC_CHECK_FUNCS( strtoll \
                 socket \
                 select \
@@ -1541,6 +1546,7 @@
 dnl if found
 [],
 dnl if not found, $ac_func is the name we check for
+if !((test "$ac_func" = "pipe") && (test "$host_os" = "msdosdjgpp")); then
   func="$ac_func"
   AC_MSG_CHECKING([deeper for $func])
   AC_TRY_LINK( [],
@@ -1551,7 +1557,7 @@
                AC_DEFINE_UNQUOTED($def, 1, [If you have $func]),
                AC_MSG_RESULT(but still no)
                )
-
+fi
 )
 
 dnl For some reason, the check above doesn't properly detect select() with
@@ -1589,6 +1595,9 @@
 #ifdef HAVE_LIBGEN_H
 #include <libgen.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 )
 
 AC_MSG_CHECKING([if we are Mac OS X (to disable poll)])
--- lib/setup.h.ori	2005-10-02 14:00:36.000000000 -0800
+++ lib/setup.h	2005-11-20 14:27:38.000000000 -0800
@@ -198,6 +198,7 @@
 #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 <tcp.h>
 #ifdef word
@@ -227,7 +228,9 @@
 #endif
 
 #define DIR_CHAR      "/"
+#ifndef DOT_CHAR
 #define DOT_CHAR      "."
+#endif
 
 #ifdef DJGPP
 #undef DOT_CHAR
--- lib/ssluse.c.ori	2005-08-10 14:57:26.000000000 -0800
+++ lib/ssluse.c	2005-11-20 10:47:26.000000000 -0800
@@ -1162,7 +1162,7 @@
 #ifdef SSL_CTRL_SET_MSG_CALLBACK
   if (data->set.fdebug) {
     if (!SSL_CTX_callback_ctrl(connssl->ctx, SSL_CTRL_SET_MSG_CALLBACK,
-                               ssl_tls_trace)) {
+                               (void *)ssl_tls_trace)) {
       failf(data, "SSL: couldn't set callback!");
       return CURLE_SSL_CONNECT_ERROR;
     }
--- lib/transfer.c.orig	2005-09-27 01:13:38.000000000 -0800
+++ lib/transfer.c	2005-11-23 20:50:12.000000000 -0800
@@ -214,7 +214,7 @@
     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);
 
--- src/setup.h.ori	2005-05-02 06:33:58.000000000 -0800
+++ src/setup.h	2005-11-20 10:55:22.000000000 -0800
@@ -103,7 +103,9 @@
 #ifdef word
 #undef word
 #endif
+#ifndef HAVE_LIMITS_H
 #define HAVE_LIMITS_H /* we have limits.h */
+#endif
 #define DIR_CHAR      "/"
 #define DOT_CHAR      "_"
 #else