* marshal.c (r_object): wrong type check for modules.

* marshal.c (w_object): should not dump anonymous classes/modules.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 9 deletions

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index e9c78dace7..e1cb058c8b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -37,13 +37,7 @@ elsif RUBY_PLATFORM =~ /-nextstep|-rhapsody|-darwin/
   CFLAGS.gsub!( /-arch\s\w*/, '' )
 end
 
-if FileTest.readable? 'nul'
-  $null = open('nul', 'w')
-elsif FileTest.readable? '/dev/null'
-  $null = open('/dev/null', 'w')
-else
-  $null = open('test.log', 'w')
-end
+$log = open('mkmf.log', 'w')
 
 LINK = "#{CONFIG['CC']} -o conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}"
 CPP = "#{CONFIG['CPP']} -E %s -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c"
@@ -67,8 +61,8 @@ def xsystem command
     print command, "\n"
     return system(command)
   end
-  $stderr.reopen($null) 
-  $stdout.reopen($null) 
+  $stderr.reopen($log) 
+  $stdout.reopen($log) 
   r = system(command)
   $stderr.reopen($orgerr)
   $stdout.reopen($orgout)