summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-29 19:55:58 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-29 19:55:58 +0000
commit4c585eeddb11697fc19355b22c1b306e301ee462 (patch)
treefc01ee575731229c6460eeebc847e3b1c904c04d
parentb05caf8dff99946adbb920171f72c0cc979d16aa (diff)
downloadruby-4c585eeddb11697fc19355b22c1b306e301ee462.tar.gz
ruby-4c585eeddb11697fc19355b22c1b306e301ee462.tar.xz
ruby-4c585eeddb11697fc19355b22c1b306e301ee462.zip
* file.c (eaccess): workaround for VC++8 runtime.
* win32/win32.c (ioinfo): VC++8 support. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9767 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--file.c3
-rw-r--r--win32/win32.c4
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f0c37b0e9..f9ccb0a57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 30 04:54:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * file.c (eaccess): workaround for VC++8 runtime.
+
+ * win32/win32.c (ioinfo): VC++8 support.
+
Thu Dec 29 23:59:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_gc_mark_threads): leave unmarked threads which won't wake
diff --git a/file.c b/file.c
index d97948db3..5a99742e7 100644
--- a/file.c
+++ b/file.c
@@ -884,6 +884,9 @@ eaccess(path, mode)
return -1;
#else
+# if _MSC_VER >= 1400
+ mode &= 6;
+# endif
return access(path, mode);
#endif
}
diff --git a/win32/win32.c b/win32/win32.c
index f4a3ee637..6541c3dc5 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1556,6 +1556,10 @@ typedef struct {
#ifdef MSVCRT_THREADS
int lockinitflag;
CRITICAL_SECTION lock;
+#if _MSC_VER >= 1400
+ char textmode;
+ char pipech2[2];
+#endif
#endif
} ioinfo;