summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-17 09:24:35 +0000
committermrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-17 09:24:35 +0000
commit6fefc895cacfbd5bed94f5d36cffb88b84cd9d57 (patch)
tree2a3789b4083622ad97e823138776860940aa724f
parentc07c5e1e9f68e220fe68232f4cf863c65fbbab0c (diff)
* ext/digest/sha2/lib/sha2.rb: revert r28347. It's my mistake.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/digest/sha2/lib/sha2.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d30d69fd5..e62e060c68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 17 18:22:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * ext/digest/sha2/lib/sha2.rb: revert r28347. It's my mistake.
+
Thu Jun 17 17:32:00 2010 Kenta Murata <mrkn@mrkn.jp>
* ext/digest/sha2/lib/sha2.rb: Darwin uses ".bundle", but not ".so",
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
index 9e91787efe..b8e4609478 100644
--- a/ext/digest/sha2/lib/sha2.rb
+++ b/ext/digest/sha2/lib/sha2.rb
@@ -10,11 +10,7 @@
# $Id$
require 'digest'
-begin
- require 'digest/sha2.so'
-rescue LoadError
- require 'digest/sha2.bundle'
-end
+require 'digest/sha2.so'
module Digest
#