From c2e85dfa8fe2531b40c097c649b3e72f676b657a Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 12 Aug 2008 04:35:13 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ test/win32ole/test_err_in_callback.rb | 4 ++-- 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 + + * test/win32ole/test_err_in_callback.rb: do not require 'mkmf' + unless WIN32OLE is defined. + Tue Aug 12 07:41:13 2008 Tanaka Akira * 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