Skip to content

Commit

Permalink
* ext/dl/cptr.c (rb_dlptr_s_to_ptr): fixed shadowing variable.
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Aug 12, 2008
1 parent 0bf6ed0 commit 3c1fca2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Tue Aug 12 14:15:13 2008 Nobuyoshi Nakada <[email protected]>

* ext/dl/cptr.c (rb_dlptr_s_to_ptr): fixed shadowing variable.

Tue Aug 12 10:18:01 2008 Yukihiro Matsumoto <[email protected]>

* test/win32ole/test_err_in_callback.rb: do not require 'mkmf'
Expand Down
4 changes: 2 additions & 2 deletions ext/dl/cptr.c
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,8 @@ rb_dlptr_s_to_ptr(VALUE self, VALUE val)
ptr = rb_dlptr_new(fp, 0, NULL);
}
else if (rb_obj_is_kind_of(val, rb_cString) == Qtrue){
char *ptr = StringValuePtr(val);
ptr = rb_dlptr_new(ptr, RSTRING_LEN(val), NULL);
char *str = StringValuePtr(val);
ptr = rb_dlptr_new(str, RSTRING_LEN(val), NULL);
}
else if (rb_respond_to(val, id_to_ptr)){
VALUE vptr = rb_funcall(val, id_to_ptr, 0);
Expand Down

0 comments on commit 3c1fca2

Please sign in to comment.