diff options
| author | uema2 <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-15 03:18:08 +0000 |
|---|---|---|
| committer | uema2 <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-15 03:18:08 +0000 |
| commit | b19e36a214a864572baee3643ddb369cfeb94d77 (patch) | |
| tree | 5bd7fecbef75dd74f4810cda212bf989f43a95a3 /defines.h | |
| parent | c476b6e05c1cae6de5d24b823e676566ae27de6c (diff) | |
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'defines.h')
| -rw-r--r-- | defines.h | 20 |
1 files changed, 13 insertions, 7 deletions
@@ -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 "," |