From 31b604a3f38a612f28738fd70dde952dc234e001 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 8 Mar 2008 09:51:00 +0000 Subject: * file.c (isdirsep): backslash is valid path separator on cygwin too. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ file.c | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e2ff66ee8..5ff4069403 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Mar 8 18:50:57 2008 Nobuyoshi Nakada + + * file.c (isdirsep): backslash is valid path separator on cygwin too. + Sat Mar 8 06:53:48 2008 NARUSE, Yui * string.c (search_nonascii): Use VALUE instead of unsigned long diff --git a/file.c b/file.c index c32afbc103..1d24b42017 100644 --- a/file.c +++ b/file.c @@ -2388,12 +2388,17 @@ rb_file_s_umask(int argc, VALUE *argv) return INT2FIX(omask); } -#if defined DOSISH +#ifdef __CYGWIN__ +#undef DOSISH +#endif +#if defined __CYGWIN__ || defined DOSISH #define DOSISH_UNC +#define DOSISH_DRIVE_LETTER #define isdirsep(x) ((x) == '/' || (x) == '\\') #else #define isdirsep(x) ((x) == '/') #endif + #ifndef CharNext /* defined as CharNext[AW] on Windows. */ # if defined(DJGPP) # define CharNext(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE)) @@ -2402,12 +2407,6 @@ rb_file_s_umask(int argc, VALUE *argv) # endif #endif -#ifdef __CYGWIN__ -#undef DOSISH -#define DOSISH_UNC -#define DOSISH_DRIVE_LETTER -#endif - #ifdef DOSISH_DRIVE_LETTER static inline int has_drive_letter(const char *buf) -- cgit v1.2.3