From 980a954f11396afc082875684037505c846d54ab Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 14 Mar 2010 22:16:12 +0000 Subject: * file.c (FILE_ALT_SEPARATOR): separated condition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- file.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index ce984f395b..557e232c84 100644 --- a/file.c +++ b/file.c @@ -2491,7 +2491,10 @@ rb_file_s_umask(int argc, VALUE *argv) #if defined __CYGWIN__ || defined DOSISH #define DOSISH_UNC #define DOSISH_DRIVE_LETTER -#define isdirsep(x) ((x) == '/' || (x) == '\\') +#define FILE_ALT_SEPARATOR '\\' +#endif +#ifdef FILE_ALT_SEPARATOR +#define isdirsep(x) ((x) == '/' || (x) == FILE_ALT_SEPARATOR) #else #define isdirsep(x) ((x) == '/') #endif @@ -5098,8 +5101,8 @@ 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 DOSISH - rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_obj_freeze(rb_usascii_str_new2("\\"))); +#ifdef FILE_ALT_SEPARATOR + 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); #endif -- cgit v1.2.3