From 64a9ce5b75ca5b58445fff752f37934d1da15faf Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 30 Aug 2006 09:46:57 +0000
Subject: * object.c (rb_Integer): Integer(nil) should raise TypeError.  
 [ruby-talk:210205]

* object.c (nil_to_s): no longer returns empty string but "nil".
  [ruby-talk:210205]

* lib/mkmf.rb: avoid COMMON_HEADERS being nil.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index b019b5f75..c5d9b194e 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1501,7 +1501,7 @@ end
 config_string('COMMON_HEADERS') do |s|
   Shellwords.shellwords(s).each {|s| hdr << "#include <#{s}>"}
 end
-COMMON_HEADERS = (hdr.join("\n") unless hdr.empty?)
+COMMON_HEADERS = if hdr.empty? then "" else hdr.join("\n") end
 COMMON_LIBS = config_string('COMMON_LIBS', &split) || []
 
 COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:]
-- 
cgit