[project @ 2003-10-13 05:21:37 by sof]

more mind-numbing CPP tweaking

diff --git a/cbits/consUtils.c b/cbits/consUtils.c
index fd51440..3514d63 100644 (file)
--- a/cbits/consUtils.c
+++ b/cbits/consUtils.c
@@ -4,7 +4,7 @@
  * Win32 Console API support
  */
 #include "config.h"
-#if defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS)
+#if defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS) || defined(__MINGW32__) || defined(_MSC_VER)
 /* to the end */
 
 #include "consUtils.h"
@@ -64,4 +64,4 @@ get_console_echo__(int fd)
     return -1;
 }
 
-#endif /* defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS) */
+#endif /* defined(mingw32_TARGET_OS) || ... */

diff --git a/cbits/dirUtils.c b/cbits/dirUtils.c
index b3fb6c0..4422440 100644 (file)
--- a/cbits/dirUtils.c
+++ b/cbits/dirUtils.c
@@ -14,7 +14,7 @@
 
 #include "HsBase.h"
 
-#if defined(mingw32_TARGET_OS)
+#if defined(mingw32_TARGET_OS) || defined(__MINGW32__) || defined(_MSC_VER)
 #include <windows.h>
 
 static