diff --git a/lib/setup.h b/lib/setup.h
index 1e64c928a..b06214dfb 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -233,7 +233,7 @@ typedef unsigned char bool;
 
 #else /* WIN32 */
 
-#ifdef DJGPP
+#ifdef MSDOS  /* Watt-32 */
 #include <sys/ioctl.h>
 #define sclose(x)         close_s(x)
 #define select(n,r,w,x,t) select_s(n,r,w,x,t)
@@ -244,7 +244,7 @@ typedef unsigned char bool;
 #undef word
 #endif
 
-#else /* DJGPP */
+#else /* MSDOS */
 
 #ifdef __BEOS__
 #define sclose(x) closesocket(x)
@@ -254,7 +254,7 @@ typedef unsigned char bool;
 
 #define HAVE_ALARM
 
-#endif /* DJGPP */
+#endif /* MSDOS */
 
 #ifdef _AMIGASF
 #undef HAVE_ALARM
@@ -267,7 +267,7 @@ typedef unsigned char bool;
 #define DOT_CHAR      "."
 #endif
 
-#ifdef DJGPP
+#ifdef MSDOS
 #undef DOT_CHAR
 #define DOT_CHAR      "_"
 #endif
diff --git a/lib/setup_once.h b/lib/setup_once.h
index 2e3dcc1f4..d3a4cc0a1 100644
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -33,7 +33,7 @@
 #define SEND_4TH_ARG MSG_NOSIGNAL
 #else
 #define SEND_4TH_ARG 0
-#endif 
+#endif
 
 
 /*
@@ -74,7 +74,7 @@
                                    (RECV_TYPE_ARG4)(SEND_4TH_ARG))
 #endif
 #else /* HAVE_RECV */
-#ifdef DJGPP
+#ifdef MSDOS
 #define sread(x,y,z) (ssize_t)read_s((int)(x), (char *)(y), (int)(z))
 #endif
 #ifndef sread
@@ -101,7 +101,7 @@
                                     (SEND_TYPE_ARG4)(SEND_4TH_ARG))
 #endif
 #else /* HAVE_SEND */
-#ifdef DJGPP
+#ifdef MSDOS
 #define swrite(x,y,z) (ssize_t)write_s((int)(x), (char *)(y), (int)(z))
 #endif
 #ifndef swrite