3 files changed, 15 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 66cef5f448..ccce9f4f7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 18 01:57:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (isdirsep): backslash is valid path separator on cygwin too.
+	  backported from 1.8 HEAD.
+
 Sat May 17 23:53:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (file_expand_path): fix for short file name on Cygwin.
diff --git a/file.c b/file.c
index 2938b89f40..cd87d8de7a 100644
--- a/file.c
+++ b/file.c
@@ -2304,12 +2304,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))
@@ -2330,12 +2335,6 @@ rb_file_s_umask(argc, argv)
 #define istrailinggabage(x) 0
 #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 7777d2e25d..a6d5133e2d 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-05-17"
+#define RUBY_RELEASE_DATE "2008-05-18"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080517
-#define RUBY_PATCHLEVEL 117
+#define RUBY_RELEASE_CODE 20080518
+#define RUBY_PATCHLEVEL 118
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];