diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-04 16:36:36 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-04 16:36:36 +0000 |
commit | da3558fddb385de8cd7d0ef4556b7073139a824e (patch) | |
tree | 4b13dbda2bbe399a77bff79bc7b64e11c23a577f | |
parent | 7b0f24634555aece61327c117e8d56d27310b281 (diff) | |
download | ruby-da3558fddb385de8cd7d0ef4556b7073139a824e.tar.gz |
* parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed
indentation broken at YARV merger.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 4 | ||||
-rw-r--r-- | version.h | 6 | ||||
-rw-r--r-- | win32/win32.c | 12 |
4 files changed, 16 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Mon Mar 5 01:36:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed + indentation broken at YARV merger. + Sun Mar 4 23:41:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_stat_uid, rb_stat_gid, eaccess): use rb_uid_t and @@ -6085,8 +6085,8 @@ parser_yylex(struct parser_params *parser) } if (c == '>') { lex_state = EXPR_ARG; - return tLAMBDA; - } + return tLAMBDA; + } if (IS_BEG() || (IS_ARG() && space_seen && !ISSPACE(c))) { if (IS_ARG()) arg_ambiguous(); @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-03-04" +#define RUBY_RELEASE_DATE "2007-03-05" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070304 +#define RUBY_RELEASE_CODE 20070305 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 4 +#define RUBY_RELEASE_DAY 5 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/win32.c b/win32/win32.c index ada33421c0..496268705c 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4049,12 +4049,12 @@ rb_w32_utime(const char *path, const struct utimbuf *times) } if (times) { - if (unixtime_to_filetime(times->actime, &atime)) { - return -1; - } - if (unixtime_to_filetime(times->modtime, &mtime)) { - return -1; - } + if (unixtime_to_filetime(times->actime, &atime)) { + return -1; + } + if (unixtime_to_filetime(times->modtime, &mtime)) { + return -1; + } } else { GetSystemTimeAsFileTime(&atime); |