diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb.in | 15 | ||||
| -rw-r--r-- | ext/gtk/gtk.c | 10 |
2 files changed, 12 insertions, 13 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index b60951538d..e1623529b6 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -313,11 +313,11 @@ archdir = $(pkglibdir)/@arch@ mfile.printf $objs.join(" ") mfile.printf "\n" - mfile.printf "\ -TARGET = %s.%s + mfile.printf << EOS +TARGET = #{target}.#{$static ? "a" : "@DLEXT@"} -INSTALL = %s@INSTALL@ -INSTALL_DATA = %s@INSTALL_DATA@ +INSTALL = #{$dots}@INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ binsuffix = @binsuffix@ @@ -328,16 +328,15 @@ clean:; @rm -f *.o *.a *.so *.sl @rm -f core ruby$(binsuffix) *~ realclean: clean -", target, - if $static then "a" else "@DLEXT@" end, $dots, $dots +EOS - mfile.printf "\ + mfile.printf <<EOS install: @test -d $(DESTDIR)$(libdir) || mkdir $(DESTDIR)$(libdir) @test -d $(DESTDIR)$(pkglibdir) || mkdir $(DESTDIR)$(pkglibdir) @test -d $(DESTDIR)$(archdir) || mkdir $(DESTDIR)$(archdir) -" +EOS if !$static mfile.printf "\ $(INSTALL) $(TARGET) $(DESTDIR)$(archdir)/$(TARGET) diff --git a/ext/gtk/gtk.c b/ext/gtk/gtk.c index fb7c5918a4..1afe083d9e 100644 --- a/ext/gtk/gtk.c +++ b/ext/gtk/gtk.c @@ -6647,11 +6647,11 @@ idle() return Qtrue; } -static void +static VALUE exec_interval(proc) VALUE proc; { - rb_funcall(proc, id_call, 0); + return rb_funcall(proc, id_call, 0); } static VALUE @@ -6660,8 +6660,8 @@ timeout_add(self, interval) { int id; - id = gtk_timeout_add_interp(NUM2INT(interval), exec_interval, - (gpointer)rb_f_lambda(), 0); + id = gtk_timeout_add(NUM2INT(interval), (GtkFunction)exec_interval, + (gpointer)rb_f_lambda()); return INT2FIX(id); } @@ -6679,7 +6679,7 @@ idle_add(self) { int id; - id = gtk_idle_add_interp(exec_interval, (gpointer)rb_f_lambda(), 0); + id = gtk_idle_add((GtkFunction)exec_interval, (gpointer)rb_f_lambda()); return INT2FIX(id); } |