From 4a965795f857b24e1ab0800f6dbe9af8a5fa425d Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 18 Nov 2009 05:13:34 +0000 Subject: merge revision(s) 24993:24997,25069:25074: * win32/win32.c (rb_w32_select): wait specified time on select. * win32/win32.c (rb_w32_select): on 1.8, we don't need to poll sockets, because our select is never called from multiple threads. * instruby.rb: win32/win32.h exists in srcdir. reported by arton ( http://www.artonx.org/diary/20090919.html#p01 ) * win32/win32.c (subtract): if the parameters are same value, should return zero. * win32/win32.c (rb_w32_select): of course, need to initialize rest. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- instruby.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'instruby.rb') diff --git a/instruby.rb b/instruby.rb index 2903a7c739..305ad905e4 100755 --- a/instruby.rb +++ b/instruby.rb @@ -359,7 +359,7 @@ install?(:local, :arch, :lib) do if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/ win32libdir = File.join(archlibdir, "win32") makedirs win32libdir - install "win32/win32.h", win32libdir, :mode => $data_mode + install File.join(srcdir, "win32", "win32.h"), win32libdir, :mode => $data_mode end end -- cgit v1.2.3