diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-24 09:58:57 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-24 09:58:57 +0000 |
commit | 0594128b55eec022a268adbe11cc75c1be5c1582 (patch) | |
tree | 4c21b83a72c9e6262dc58b4c09454c57c7c52a67 | |
parent | d7d0ed4d6f458bdbf34fe9b04010276bdeb3ff86 (diff) |
* stable version 1.8.4 released.
* ext/digest/sha2/sha2.c (ULL): support AIX C. a patch from
Kailden <kailden at gmail.com>. [ruby-core:06984]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ext/digest/sha2/sha2.c | 2 | ||||
-rw-r--r-- | test/ruby/test_signal.rb | 2 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,12 @@ +Sat Dec 24 18:58:14 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * stable version 1.8.4 released. + +Fri Dec 23 10:30:23 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/digest/sha2/sha2.c (ULL): support AIX C. a patch from + Kailden <kailden at gmail.com>. [ruby-core:06984] + Wed Dec 21 16:53:06 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * 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 @@ -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[]; |