summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-17 17:39:05 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-17 17:39:05 +0000
commit859cfa63cf8938105e249962094e5a31f14f5bd6 (patch)
tree25050b2e927d36ed600c8d306fc7209d15eb5bc0
parent7d75eaeeadd4afc903ea6764d2be7bc14bde5ea0 (diff)
downloadruby-859cfa63cf8938105e249962094e5a31f14f5bd6.tar.gz
ruby-859cfa63cf8938105e249962094e5a31f14f5bd6.tar.xz
ruby-859cfa63cf8938105e249962094e5a31f14f5bd6.zip
* defines.h (_WIN32): undef _WIN32 on Cygwin before defining DOSISH.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--defines.h7
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8079bce85..c391e9fba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan 18 02:33:26 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * defines.h (_WIN32): undef _WIN32 on Cygwin before defining DOSISH.
+
Thu Jan 15 13:03:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_read): do not append EOF. (ruby-bugs-ja:PR#585)
diff --git a/defines.h b/defines.h
index 1cab4aef6..d59bcc8ef 100644
--- a/defines.h
+++ b/defines.h
@@ -82,6 +82,10 @@ void xfree _((void*));
# define BDIGIT_DBL_SIGNED long
#endif
+#ifdef __CYGWIN__
+#undef _WIN32
+#endif
+
#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
#define DOSISH 1
#ifndef _WIN32_WCE
@@ -176,9 +180,6 @@ typedef int pid_t;
#endif /* __APPLE__ */
#endif /* NeXT */
-#ifdef __CYGWIN__
-#undef _WIN32
-#endif
#ifdef _WIN32
#include "win32/win32.h"
#endif