summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-31 08:59:09 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-31 08:59:09 +0000
commitf9322a5cdbf0f71333d65c8f5bba4fcc8eeba43e (patch)
tree9ca0acfa40de653d139f73e730f21038b0a6d278
parentd8c15488b052a0cdf4ec3e1d6f400d4ebb9c5cd3 (diff)
downloadruby-f9322a5cdbf0f71333d65c8f5bba4fcc8eeba43e.tar.gz
ruby-f9322a5cdbf0f71333d65c8f5bba4fcc8eeba43e.tar.xz
ruby-f9322a5cdbf0f71333d65c8f5bba4fcc8eeba43e.zip
* lib/mkmf.rb (Logging.log_open): opens in binary mode to get rid of
extra CR. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb11
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2dac7cdf1..006145c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sun Aug 31 17:52:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Aug 31 17:58:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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 89b64bcad..a403fa81d 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