nobu	2008-05-17 23:50:38 +0900 (Sat, 17 May 2008)

  New Revision: 16449

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/file.c
    branches/ruby_1_8_5/version.h
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/file.c
    branches/ruby_1_8_6/version.h

  Log:
    * file.c (OpenFile): prevent conflict on Windows.
    
    * file.c (USE_NTFS): fixed merge miss.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=16449&r2=16448&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16449&r2=16448&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/file.c?r1=16449&r2=16448&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16449&r2=16448&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16449&r2=16448&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/file.c?r1=16449&r2=16448&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16448)
+++ ruby_1_8_5/ChangeLog	(revision 16449)
@@ -1,3 +1,9 @@
+Sat May 17 23:50:29 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (OpenFile): prevent conflict on Windows.
+
+	* file.c (USE_NTFS): fixed merge miss.
+
 Sat May 17 12:36:46 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (file_expand_path): rb_str_set_len is not backported.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16448)
+++ ruby_1_8_5/version.h	(revision 16449)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-05-17"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080517
-#define RUBY_PATCHLEVEL 116
+#define RUBY_PATCHLEVEL 117
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/file.c
===================================================================
--- ruby_1_8_5/file.c	(revision 16448)
+++ ruby_1_8_5/file.c	(revision 16449)
@@ -20,11 +20,13 @@
 #include <sys/cygwin.h>
 #endif
 
+#define OpenFile rb_io_t
 #include "ruby.h"
 #include "rubyio.h"
 #include "rubysig.h"
 #include "util.h"
 #include "dln.h"
+#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -2308,6 +2310,8 @@
 # else
 #   define CharNext(p) ((p) + 1)
 # endif
+#endif
+
 #if defined _WIN32 || defined __CYGWIN__
 #define USE_NTFS 1
 #else
@@ -2320,8 +2324,6 @@
 #define istrailinggabage(x) 0
 #endif
 
-#endif
-
 #ifdef __CYGWIN__
 #undef DOSISH
 #define DOSISH_UNC
@@ -2921,7 +2923,7 @@
 	if (NIL_P(fext) || !(f = rmext(p, n, StringValueCStr(fext)))) {
 	    f = n;
 	}
-	if (f == RSTRING_LEN(fname)) return fname;
+	if (f == RSTRING(fname)->len) return fname;
     }
     basename = rb_str_new(p, f);
     OBJ_INFECT(basename, fname);
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 16448)
+++ ruby_1_8_6/ChangeLog	(revision 16449)
@@ -1,3 +1,9 @@
+Sat May 17 23:50:29 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (OpenFile): prevent conflict on Windows.
+
+	* file.c (USE_NTFS): fixed merge miss.
+
 Sat May 17 12:36:46 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (file_expand_path): rb_str_set_len is not backported.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 16448)
+++ ruby_1_8_6/version.h	(revision 16449)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-05-17"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080517
-#define RUBY_PATCHLEVEL 115
+#define RUBY_PATCHLEVEL 116
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/file.c
===================================================================
--- ruby_1_8_6/file.c	(revision 16448)
+++ ruby_1_8_6/file.c	(revision 16449)
@@ -20,11 +20,13 @@
 #include <sys/cygwin.h>
 #endif
 
+#define OpenFile rb_io_t
 #include "ruby.h"
 #include "rubyio.h"
 #include "rubysig.h"
 #include "util.h"
 #include "dln.h"
+#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -2314,6 +2316,8 @@
 # else
 #   define CharNext(p) ((p) + 1)
 # endif
+#endif
+
 #if defined _WIN32 || defined __CYGWIN__
 #define USE_NTFS 1
 #else
@@ -2326,8 +2330,6 @@
 #define istrailinggabage(x) 0
 #endif
 
-#endif
-
 #ifdef __CYGWIN__
 #undef DOSISH
 #define DOSISH_UNC

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/