From 6ed425d55b45cfbca9f03e6083ac35622e694653 Mon Sep 17 00:00:00 2001 From: ko1 Date: Sat, 26 Sep 2009 17:02:43 +0000 Subject: [PATCH] * string.c: use rename-macro instead of RUBY_ALIAS_FUNCTION_TYPE. Because build causes failure. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 13 ++++--------- version.h | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f44cd9ad8..987ef816fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Sep 27 02:00:46 2009 Koichi Sasada + + * string.c: use rename-macro instead of RUBY_ALIAS_FUNCTION_TYPE. + Because build causes failure. + Sat Sep 26 23:29:11 2009 Nobuyoshi Nakada * st.c: moved murmur hash from string.c. [ruby-dev:39376] diff --git a/string.c b/string.c index 55fce5629d..d1ee6b5578 100644 --- a/string.c +++ b/string.c @@ -1979,15 +1979,10 @@ rb_str_concat(VALUE str1, VALUE str2) #undef rb_hash_uint32 #undef rb_hash_uint #undef rb_hash_end -RUBY_ALIAS_FUNCTION_TYPE(st_index_t, - rb_hash_uint32(st_index_t h, uint32_t i), - st_hash_uint32, (h, i)); -RUBY_ALIAS_FUNCTION_TYPE(st_index_t, - rb_hash_uint(st_index_t h, st_index_t i), - st_hash_uint, (h, i)); -RUBY_ALIAS_FUNCTION_TYPE(st_index_t, - rb_hash_end(st_index_t h), - st_hash_end, (h)); + +#define rb_hash_uint32 st_hash_uint32 +#define rb_hash_uint st_hash_uint +#define rb_hash_end st_hash_end st_index_t rb_hash_start(st_index_t h) diff --git a/version.h b/version.h index dd5a1e3864..01f542360b 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-09-26" +#define RUBY_RELEASE_DATE "2009-09-27" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 27 #include "ruby/version.h"