aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-14 22:51:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-14 22:51:08 +0000
commitae0224673eaa8694536aeae3f5f594b7b07fd624 (patch)
tree39f21cefe04849be9df5fd74ff247d0663491cbc
parent71f4f96249e653ec65f138b52b15d777b342a6a6 (diff)
downloadruby-ae0224673eaa8694536aeae3f5f594b7b07fd624.tar.gz
* file.c (Init_File): do not define File::ALT_SEPARATOR on cygwin.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--file.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ee026af1ec..eeecd69e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 15 07:51:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (Init_File): do not define File::ALT_SEPARATOR on cygwin.
+
Mon Mar 15 07:41:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (realpath_rec): use same cache.
diff --git a/file.c b/file.c
index 24b843e904..b6205cf899 100644
--- a/file.c
+++ b/file.c
@@ -5114,7 +5114,7 @@ Init_File(void)
rb_define_singleton_method(rb_cFile, "split", rb_file_s_split, 1);
rb_define_singleton_method(rb_cFile, "join", rb_file_s_join, -2);
-#ifdef FILE_ALT_SEPARATOR
+#ifdef DOSISH
rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_obj_freeze(rb_usascii_str_new2(file_alt_separator)));
#else
rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil);