summaryrefslogtreecommitdiff
path: root/defines.h
diff options
context:
space:
mode:
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h20
1 files changed, 13 insertions, 7 deletions
diff --git a/defines.h b/defines.h
index 55dd9eecf4..52d9856ab6 100644
--- a/defines.h
+++ b/defines.h
@@ -86,9 +86,16 @@ void xfree _((void*));
# define BDIGIT_DBL_SIGNED long
#endif
+#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
+#define DOSISH 1
+#ifndef _WIN32_WCE
+# define DOSISH_DRIVE_LETTER
+#endif
+#endif
+
/* define RUBY_USE_EUC/SJIS for default kanji-code */
#ifndef DEFAULT_KCODE
-#if defined(MSDOS) || defined(__CYGWIN__) || defined(__human68k__) || defined(__MACOS__) || defined(__EMX__) || defined(OS2) || defined(NT) || defined(_WIN32_WCE)
+#if defined(DOSISH) || defined(__CYGWIN__) || defined(__MACOS__) || defined(OS2)
#define DEFAULT_KCODE KCODE_SJIS
#else
#define DEFAULT_KCODE KCODE_EUC
@@ -106,7 +113,10 @@ void xfree _((void*));
#define HAVE_SYS_WAIT_H /* configure fails to find this */
#endif /* NeXT */
-#if defined(NT) || defined(_WIN32_WCE)
+#ifdef __CYGWIN__
+#undef _WIN32
+#endif
+#ifdef _WIN32
#include "win32/win32.h"
#endif
@@ -137,11 +147,7 @@ void xfree _((void*));
#define FLUSH_REGISTER_WINDOWS /* empty -- nothing to do here */
#endif
-#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
-#define DOSISH 1
-#endif
-
-#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(OS2) || defined(_WIN32_WCE)
+#if defined(DOSISH)
#define PATH_SEP ";"
#elif defined(riscos)
#define PATH_SEP ","