summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-17 14:50:38 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-17 14:50:38 +0000
commitb881b57c9e025dc5bc36e2ac9c17911f353755a6 (patch)
tree6726fb0b2bc1387abae8995667eb765c149d5292
parent86a6bd638447e2684c0b177a1da7509fce1cce71 (diff)
* file.c (OpenFile): prevent conflict on Windows.
* file.c (USE_NTFS): fixed merge miss. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--file.c6
-rw-r--r--version.h2
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fc5dd5..3868cb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat May 17 23:50:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (OpenFile): prevent conflict on Windows.
+
+ * file.c (USE_NTFS): fixed merge miss.
+
Sat May 17 12:36:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (file_expand_path): rb_str_set_len is not backported.
diff --git a/file.c b/file.c
index 7b46291..da4443b 100644
--- a/file.c
+++ b/file.c
@@ -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 @@ rb_file_s_umask(argc, argv)
# else
# define CharNext(p) ((p) + 1)
# endif
+#endif
+
#if defined _WIN32 || defined __CYGWIN__
#define USE_NTFS 1
#else
@@ -2326,8 +2330,6 @@ rb_file_s_umask(argc, argv)
#define istrailinggabage(x) 0
#endif
-#endif
-
#ifdef __CYGWIN__
#undef DOSISH
#define DOSISH_UNC
diff --git a/version.h b/version.h
index c60ab02..944a180 100644
--- a/version.h
+++ b/version.h
@@ -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