diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-16 15:43:51 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-16 15:43:51 +0000 |
commit | 54aadf55564ffeea8ac85c4179e262a363073e3f (patch) | |
tree | ba93731553ede535ae268e8ac07f390a0e6c6f2e | |
parent | f52547c2bc07e96da2b007060faaac40b5eb0545 (diff) |
* version.c (ruby_description): RUBY_REVISION_STR may be empty.
[ruby-core:30268]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | version.c | 8 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Mon May 17 00:43:47 2010 Nobuyoshi Nakada <[email protected]> + + * version.c (ruby_description): RUBY_REVISION_STR may be empty. + [ruby-core:30268] + Sun May 16 10:49:47 2010 Nobuyoshi Nakada <[email protected]> * ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments. @@ -41,14 +41,20 @@ const struct { char patchlevel[sizeof(RUBY_PATCHLEVEL_STR)-1]; char pad1[2]; char release_date[sizeof(RUBY_RELEASE_DATE)-1]; +#if RUBY_REVISION char revision[sizeof(RUBY_REVISION_STR)-1]; +#endif char pad2[3]; char platform[sizeof(RUBY_PLATFORM)-1]; char pad3[2]; } ruby_description[1] UNALIGNED = { { "ruby ", RUBY_VERSION, RUBY_PATCHLEVEL_STR, - " (", RUBY_RELEASE_DATE, RUBY_REVISION_STR, ") [", + " (", RUBY_RELEASE_DATE, +#if RUBY_REVISION + RUBY_REVISION_STR, +#endif + ") [", RUBY_PLATFORM, "]" } }; @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2010-05-16" +#define RUBY_RELEASE_DATE "2010-05-17" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20100516 +#define RUBY_RELEASE_CODE 20100517 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 #define NO_STRING_LITERAL_CONCATENATION 1 #ifdef RUBY_EXTERN |