mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
tcltklib.c: basename
* ext/tk/tcltklib.c (setup_rubytkkit): use ruby_enc_find_basename if available, instead of File.basename. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
753ee6ac57
commit
1a2a4084d9
2 changed files with 9 additions and 1 deletions
|
@ -1795,7 +1795,9 @@ print("check functions.")
|
||||||
|
|
||||||
%w"ruby_native_thread_p rb_errinfo rb_safe_level rb_hash_lookup
|
%w"ruby_native_thread_p rb_errinfo rb_safe_level rb_hash_lookup
|
||||||
rb_proc_new rb_obj_untrust rb_obj_taint rb_set_safe_level_force
|
rb_proc_new rb_obj_untrust rb_obj_taint rb_set_safe_level_force
|
||||||
rb_sourcefile rb_thread_alive_p rb_thread_check_trap_pending".each do |func|
|
rb_sourcefile rb_thread_alive_p rb_thread_check_trap_pending
|
||||||
|
ruby_enc_find_basename
|
||||||
|
".each do |func|
|
||||||
have_func(func, "ruby.h")
|
have_func(func, "ruby.h")
|
||||||
print(".") # progress
|
print(".") # progress
|
||||||
end
|
end
|
||||||
|
|
|
@ -1263,11 +1263,17 @@ setup_rubytkkit(void)
|
||||||
#ifdef __WIN32__
|
#ifdef __WIN32__
|
||||||
/* rbtk_win32_SetHINSTANCE("tcltklib.so"); */
|
/* rbtk_win32_SetHINSTANCE("tcltklib.so"); */
|
||||||
{
|
{
|
||||||
|
# ifdef HAVE_RUBY_ENC_FIND_BASENAME
|
||||||
|
const char *base = ruby_enc_find_basename(rb_sourcefile(), NULL, NULL,
|
||||||
|
rb_filesystem_encoding());
|
||||||
|
rbtk_win32_SetHINSTANCE(base);
|
||||||
|
# else
|
||||||
VALUE basename;
|
VALUE basename;
|
||||||
basename = rb_funcall(rb_cFile, rb_intern("basename"), 1,
|
basename = rb_funcall(rb_cFile, rb_intern("basename"), 1,
|
||||||
rb_str_new2(rb_sourcefile()));
|
rb_str_new2(rb_sourcefile()));
|
||||||
rbtk_win32_SetHINSTANCE(RSTRING_PTR(basename));
|
rbtk_win32_SetHINSTANCE(RSTRING_PTR(basename));
|
||||||
RB_GC_GUARD(basename);
|
RB_GC_GUARD(basename);
|
||||||
|
# endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
set_rubytk_kitpath(rb_sourcefile());
|
set_rubytk_kitpath(rb_sourcefile());
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue