From 0594128b55eec022a268adbe11cc75c1be5c1582 Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 24 Dec 2005 09:58:57 +0000 Subject: [PATCH] * stable version 1.8.4 released. * ext/digest/sha2/sha2.c (ULL): support AIX C. a patch from Kailden . [ruby-core:06984] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ ext/digest/sha2/sha2.c | 2 +- test/ruby/test_signal.rb | 2 +- version.h | 6 +++--- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9deaaeaa66..824a949c69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat Dec 24 18:58:14 2005 Yukihiro Matsumoto + + * stable version 1.8.4 released. + +Fri Dec 23 10:30:23 2005 Yukihiro Matsumoto + + * ext/digest/sha2/sha2.c (ULL): support AIX C. a patch from + Kailden . [ruby-core:06984] + Wed Dec 21 16:53:06 2005 Hirokazu Yamamoto * file.c (w32_io_info): should return handle because FileIndex is diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c index 24a57ded0d..41ed2df106 100644 --- a/ext/digest/sha2/sha2.c +++ b/ext/digest/sha2/sha2.c @@ -67,7 +67,7 @@ typedef uint8_t sha2_byte; /* Exactly 1 byte */ typedef uint32_t sha2_word32; /* Exactly 4 bytes */ typedef uint64_t sha2_word64; /* Exactly 8 bytes */ -#if defined(__GNUC__) || defined(_HPUX_SOURCE) +#if defined(__GNUC__) || defined(_HPUX_SOURCE) || defined(__IBMC__) #define ULL(number) number##ULL #else #define ULL(number) (uint64_t)(number) diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb index 8daa1cfa21..43e16b8c79 100644 --- a/test/ruby/test_signal.rb +++ b/test/ruby/test_signal.rb @@ -50,7 +50,7 @@ class TestSignal < Test::Unit::TestCase assert_nothing_raised("[ruby-dev:26128]") { Process.kill(:USR1, pid) begin - Timeout.timeout(1) { + Timeout.timeout(10) { Process.waitpid pid } rescue Timeout::Error diff --git a/version.h b/version.h index 035ef3548f..c648e22d39 100644 --- a/version.h +++ b/version.h @@ -1,14 +1,14 @@ #define RUBY_VERSION "1.8.4" -#define RUBY_RELEASE_DATE "2005-12-22" +#define RUBY_RELEASE_DATE "2005-12-24" #define RUBY_VERSION_CODE 184 -#define RUBY_RELEASE_CODE 20051222 +#define RUBY_RELEASE_CODE 20051224 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 4 #define RUBY_RELEASE_YEAR 2005 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 24 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[];