From 6e37ddcfbddd5053655d38bf8dc827d8c2ea3379 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 31 Aug 2008 08:59:09 +0000 Subject: [PATCH] * lib/mkmf.rb (Logging.log_open): opens in binary mode to get rid of extra CR. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- lib/mkmf.rb | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2dac7cdf1f..006145c51f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Sun Aug 31 17:52:45 2008 Nobuyoshi Nakada +Sun Aug 31 17:58:59 2008 Nobuyoshi Nakada + + * lib/mkmf.rb (Logging.log_open): opens in binary mode to get rid of + extra CR. * lib/mkmf.rb (try_func, try_var, have_struct_member), (scalar_ptr_type?, scalar_type?): use MAIN_DOES_NOTHING. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 89b64bcad3..a403fa81d6 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -232,9 +232,13 @@ module Logging @postpone = 0 @quiet = $extmk - def self::open - @log ||= File::open(@logfile, 'w') + def self::log_open + @log ||= File::open(@logfile, 'wb') @log.sync = true + end + + def self::open + log_open $stderr.reopen(@log) $stdout.reopen(@log) yield @@ -244,8 +248,7 @@ module Logging end def self::message(*s) - @log ||= File::open(@logfile, 'w') - @log.sync = true + log_open @log.printf(*s) end