From 613ad450424e7aa0de19923f3158768a5b82acce 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/branches/ruby_1_8@15732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ file.c | 13 ++++++------- version.h | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 536dcc20f8..58289f36d0 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. + Fri Mar 7 19:56:10 2008 Nobuyoshi Nakada * lib/mkmf.rb: rdoc added. [ruby-Patches-9762] diff --git a/file.c b/file.c index 85ae53b561..1e5df414c4 100644 --- a/file.c +++ b/file.c @@ -2299,12 +2299,17 @@ rb_file_s_umask(argc, 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, MB_CUR_MAX)) @@ -2313,12 +2318,6 @@ rb_file_s_umask(argc, 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(buf) diff --git a/version.h b/version.h index 8f0918e9ad..0715a0ae1b 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-03-07" +#define RUBY_RELEASE_DATE "2008-03-08" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080307 +#define RUBY_RELEASE_CODE 20080308 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 7 +#define RUBY_RELEASE_DAY 8 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3