From ae0224673eaa8694536aeae3f5f594b7b07fd624 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 14 Mar 2010 22:51:08 +0000 Subject: [PATCH] * 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 --- ChangeLog | 4 ++++ file.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * file.c (Init_File): do not define File::ALT_SEPARATOR on cygwin. + Mon Mar 15 07:41:00 2010 Nobuyoshi Nakada * 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);