summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--win32/win32.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 59cb71ba02f..7afe3bff32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep 9 23:43:33 2002 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * win32/win32.h (S_I?USR): define only if not mingw32.
+
Mon Sep 9 11:21:04 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* ext/stringio/stringio.c (strio_set_string): reinitialize
diff --git a/win32/win32.h b/win32/win32.h
index 54ca551dcac..95a6e4d47ff 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -240,7 +240,7 @@ extern int isnan(double);
#define S_ISREG(m) (((unsigned short)(m) & S_IFMT) == S_IFREG)
#endif
-#ifndef S_IRUSR
+#if !defined S_IRUSR && !defined __MINGW32__
#define S_IRUSR 0400
#endif
#ifndef S_IRGRP
@@ -250,7 +250,7 @@ extern int isnan(double);
#define S_IROTH 0004
#endif
-#ifndef S_IWUSR
+#if !defined S_IWUSR && !defined __MINGW32__
#define S_IWUSR 0200
#endif
#ifndef S_IWGRP
@@ -260,7 +260,7 @@ extern int isnan(double);
#define S_IWOTH 0002
#endif
-#ifndef S_IXUSR
+#if !defined S_IXUSR && !defined __MINGW32__
#define S_IXUSR 0100
#endif
#ifndef S_IXGRP