summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-22 00:58:04 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-22 00:58:04 +0000
commit34b365b1e71d36185141125c84120623276fad92 (patch)
treedf82d5077ae1da979acd74e349ccdefc7da2bfbb
parent408728d75dd12fc21d6246a9473fd08a26d75a22 (diff)
downloadruby-34b365b1e71d36185141125c84120623276fad92.tar.gz
ruby-34b365b1e71d36185141125c84120623276fad92.tar.xz
ruby-34b365b1e71d36185141125c84120623276fad92.zip
* file.c (eaccess): workaround for recent msvcrt's behavior.
[ruby-core:16460] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--file.c4
-rw-r--r--version.h6
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b3dd0e10f..241493557 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 22 09:56:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * file.c (eaccess): workaround for recent msvcrt's behavior.
+ [ruby-core:16460]
+
Mon Apr 21 19:08:32 2008 Tanaka Akira <akr@fsij.org>
* io.c (copy_stream_body): call rb_io_check_readable and
diff --git a/file.c b/file.c
index b42bc2eee..88893e7d9 100644
--- a/file.c
+++ b/file.c
@@ -944,8 +944,8 @@ eaccess(const char *path, int mode)
return -1;
#else
-# if _MSC_VER >= 1400
- mode &= 6;
+# if defined(_MSC_VER) || defined(__MINGW32__)
+ mode &= ~1;
# endif
return access(path, mode);
#endif
diff --git a/version.h b/version.h
index bac42999d..9735b1d8c 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-04-21"
+#define RUBY_RELEASE_DATE "2008-04-22"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080421
+#define RUBY_RELEASE_CODE 20080422
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 22
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];