From 5b72eb0b03b3832b956072c62cc5a5985a6059ef Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 5 Jul 2003 13:13:49 +0000
Subject: Some of Doug Kaufman's changes for the DOS port

---
 lib/getpass.c | 8 +++-----
 lib/setup.h   | 7 +++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/getpass.c b/lib/getpass.c
index 5886748b7..7db8f51a9 100644
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -99,7 +99,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
   char infp_fclose = 0;
   FILE *outfp;
   RETSIGTYPE (*sigint)();
-#if !defined(__EMX__) && !defined(__DJGPP__)
+#ifdef SIGTSTP
   RETSIGTYPE (*sigtstp)();
 #endif
   size_t bytes_read;
@@ -117,9 +117,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
 #endif
 
   sigint = signal(SIGINT, SIG_IGN);
-  /* 20000318 mgs
-   * this is needed by the emx system, SIGTSTP is not a supported signal */
-#if !defined(__EMX__) && !defined(__DJGPP__)
+#ifdef SIGTSTP
   sigtstp = signal(SIGTSTP, SIG_IGN);
 #endif
 
@@ -181,7 +179,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
 #endif
   
   signal(SIGINT, sigint);
-#if !defined(__EMX__) && !defined(__DJGPP__)
+#ifdef SIGTSTP
   signal(SIGTSTP, sigtstp);
 #endif
 
diff --git a/lib/setup.h b/lib/setup.h
index 0a109111f..4af61f97e 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -145,6 +145,13 @@ defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO)
 #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
+#undef word
+#endif
+
 #else
 
 #define sclose(x) close(x)
-- 
cgit v1.2.3