summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-12 04:35:13 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-12 04:35:13 +0000
commitc2e85dfa8fe2531b40c097c649b3e72f676b657a (patch)
treea2b49552a476bdfa29a164d4b991289a8c07c3ee
parent61f512a3575df2ca3c894c426d47cdc27ca8d4fd (diff)
* test/win32ole/test_err_in_callback.rb: do not require 'mkmf'
unless WIN32OLE is defined. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/win32ole/test_err_in_callback.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d2ca3a954..2a4e4dfc70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 12 10:18:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * test/win32ole/test_err_in_callback.rb: do not require 'mkmf'
+ unless WIN32OLE is defined.
+
Tue Aug 12 07:41:13 2008 Tanaka Akira <akr@fsij.org>
* transcode_data.h (rb_transcoder): add resetstate_func field for
diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb
index 6a7de56183..11ea6273fd 100644
--- a/test/win32ole/test_err_in_callback.rb
+++ b/test/win32ole/test_err_in_callback.rb
@@ -8,9 +8,9 @@ begin
rescue LoadError
end
require 'rbconfig'
-require 'mkmf'
-require 'test/unit'
if defined?(WIN32OLE)
+ require 'mkmf'
+ require 'test/unit'
class TestErrInCallBack < Test::Unit::TestCase
def setup
@ruby = nil