From cd9423097a0cbc5408a37d5e65f412bb6906ea8e Mon Sep 17 00:00:00 2001
From: nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Mar 2011 04:39:04 +0000
Subject:         * ext/openssl/lib/openssl/buffering.rb: removed circular
 require of           openssl.rb.

        * ext/openssl/lib/openssl/*: removed following comment for transition
          measures of avoiding circular require. No one claimed about this as
          far as I know.
          ##
          # Should we care what if somebody require this file directly?
          # require "openssl"


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                            | 12 ++++++++++++
 ext/openssl/lib/openssl/bn.rb        |  4 ----
 ext/openssl/lib/openssl/buffering.rb |  2 --
 ext/openssl/lib/openssl/cipher.rb    |  4 ----
 ext/openssl/lib/openssl/config.rb    |  3 ---
 ext/openssl/lib/openssl/digest.rb    |  4 ----
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b0279ad1fb..2d3d1c0d8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Mar 22 13:33:22 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/buffering.rb: removed circular require of
+	  openssl.rb.
+
+	* ext/openssl/lib/openssl/*: removed following comment for transition
+	  measures of avoiding circular require. No one claimed about this as
+	  far as I know.
+	  ##
+	  # Should we care what if somebody require this file directly?
+	  # require "openssl"
+
 Tue Mar 22 10:57:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* test/runner.rb: set Gem::TestCase's @@project_dir.
diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb
index 624c13715c..1bf3afae42 100644
--- a/ext/openssl/lib/openssl/bn.rb
+++ b/ext/openssl/lib/openssl/bn.rb
@@ -14,10 +14,6 @@
   $Id$
 =end
 
-##
-# Should we care what if somebody require this file directly?
-#require 'openssl'
-
 module OpenSSL
   class BN
     include Comparable
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 2fb33749e3..a11fe73357 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -14,8 +14,6 @@
   $Id$
 =end
 
-require 'openssl'
-
 ##
 # OpenSSL IO buffering mix-in module.
 #
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
index 290e9c1d2d..14362ea86f 100644
--- a/ext/openssl/lib/openssl/cipher.rb
+++ b/ext/openssl/lib/openssl/cipher.rb
@@ -14,10 +14,6 @@
   $Id$
 =end
 
-##
-# Should we care what if somebody require this file directly?
-#require 'openssl'
-
 module OpenSSL
   class Cipher
     %w(AES CAST5 BF DES IDEA RC2 RC4 RC5).each{|name|
diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
index 9fc42c623a..24a54c91ec 100644
--- a/ext/openssl/lib/openssl/config.rb
+++ b/ext/openssl/lib/openssl/config.rb
@@ -10,9 +10,6 @@
 
 =end
 
-##
-# Should we care what if somebody require this file directly?
-#require 'openssl'
 require 'stringio'
 
 module OpenSSL
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index e603c41de4..d841fef242 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -14,10 +14,6 @@
   $Id$
 =end
 
-##
-# Should we care what if somebody require this file directly?
-#require 'openssl'
-
 module OpenSSL
   class Digest
 
-- 
cgit v1.2.3