Added VC++ support thanks to U.Nakamura's patch. [ruby-dev:25644]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 4 deletions

diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb
index 0b071d4ca..b5a688974 100644
--- a/ext/dl/mkcallback.rb
+++ b/ext/dl/mkcallback.rb
@@ -111,18 +111,17 @@ for calltype in CALLTYPES
       for n in 0..(MAX_CALLBACK-1)
         $out << (<<-EOS)
 
-PRE_DECL_#{calltype.upcase} static #{DLTYPE[ty][:type]}
+PRE_DECL_#{calltype.upcase} static #{DLTYPE[ty][:type]} MIDST_DECL_#{calltype.upcase}
 #{func_name(ty,argc,n,calltype)}(#{(0...argc).collect{|i| "DLSTACK_TYPE stack" + i.to_s}.join(", ")}) POST_DECL_#{calltype.upcase}
 {
-    VALUE args[#{argc}];
-    VALUE ret, cb;
+    VALUE ret, cb#{argc > 0 ? ", args[#{argc}]" : ""};
 #{
       (0...argc).collect{|i|
 	"    args[%d] = LONG2NUM(stack%d);" % [i,i]
       }.join("\n")
 }
     cb = rb_ary_entry(rb_ary_entry(#{proc_entry}, #{ty}), #{(n * DLSTACK_SIZE) + argc});
-    ret = rb_funcall2(cb, cb_call, #{argc}, args);
+    ret = rb_funcall2(cb, cb_call, #{argc}, #{argc > 0 ? 'args' : 'NULL'});
     return #{DLTYPE[ty][:conv] ? DLTYPE[ty][:conv] % "ret" : ""};
 }