From 7af9573be29acff7da482af2bed17a02f71cd6b3 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 2 Mar 2013 17:28:03 +0000 Subject: [PATCH] merge revision(s) 39253: win32.c: style * win32/win32.c (rb_w32_fd_is_text): adjust style. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- version.h | 2 +- win32/win32.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/version.h b/version.h index 4cb542e798..1f2959b315 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-03" -#define RUBY_PATCHLEVEL 6 +#define RUBY_PATCHLEVEL 7 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 diff --git a/win32/win32.c b/win32/win32.c index 984e03b0dd..c4678b1593 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -6582,7 +6582,8 @@ rb_w32_inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len) /* License: Ruby's */ char -rb_w32_fd_is_text(int fd) { +rb_w32_fd_is_text(int fd) +{ return _osfile(fd) & FTEXT; }