summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-06 14:00:54 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-06 14:00:54 +0000
commitb5f72bc6cb12301a5bc0dfdaf54d1d3d23c7948d (patch)
tree3377751600ae0fbdebe4a5f234604853f9c3c394 /ext
parent6608596896a8acf92401fdb2530d16b93f2ffd90 (diff)
downloadruby-b5f72bc6cb12301a5bc0dfdaf54d1d3d23c7948d.tar.gz
ruby-b5f72bc6cb12301a5bc0dfdaf54d1d3d23c7948d.tar.xz
ruby-b5f72bc6cb12301a5bc0dfdaf54d1d3d23c7948d.zip
* eval.c (rb_mod_modfunc): should break if m has no super class.
[ruby-dev:22498] * backport changes from 1.9 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/syck/emitter.c2
-rw-r--r--ext/tk/lib/multi-tk.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
index 4dcc8b3fc..d373ed4c4 100644
--- a/ext/syck/emitter.c
+++ b/ext/syck/emitter.c
@@ -239,7 +239,7 @@ syck_emitter_write( SyckEmitter *e, char *str, long len )
long rest = e->bufsize - (e->marker - e->buffer);
if (len <= rest) break;
S_MEMCPY( e->marker, str, char, rest );
- e->marker += len;
+ e->marker += rest;
str += rest;
len -= rest;
syck_emitter_flush( e, 0 );
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index b6c800177..c2dcb4f97 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -17,7 +17,7 @@ TclTkLib.mainloop_abort_on_exception = true
################################################
# exceptiopn to treat the return value from IP
class MultiTkIp_OK < Exception
- def self.send(thred, ret=nil)
+ def self.send(thread, ret=nil)
thread.raise self.new(ret)
end