summaryrefslogtreecommitdiff
path: root/ext/tk/tkutil/tkutil.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-11 15:56:22 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-11 15:56:22 +0000
commitcf508bfedad6613d69b1d784a3a804538eae55d0 (patch)
tree40c0a2c40ecf167f93198a0c3b57091667fbc4c8 /ext/tk/tkutil/tkutil.c
parenta999490fe3832b0706816890eccfe6699b4737aa (diff)
* ext/tk: check proper conditions. [ruby-dev:35047]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/tkutil/tkutil.c')
-rw-r--r--ext/tk/tkutil/tkutil.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
index 00d719143b..fb07efbc03 100644
--- a/ext/tk/tkutil/tkutil.c
+++ b/ext/tk/tkutil/tkutil.c
@@ -11,7 +11,7 @@
#include "ruby.h"
-#ifdef RUBY_VM /* Ruby 1.9 */
+#ifdef HAVE_RUBY_RUBY_H
/* #include "ruby/ruby.h" */
#include "ruby/signal.h"
#include "ruby/st.h"
@@ -117,8 +117,8 @@ tk_do_callback(argc, argv, self)
ID_call, argc - 1, argv + 1);
}
-static char *cmd_id_head = "ruby_cmd TkUtil callback ";
-static char *cmd_id_prefix = "cmd";
+static const char cmd_id_head[] = "ruby_cmd TkUtil callback ";
+static const char cmd_id_prefix[] = "cmd";
static VALUE
tk_install_cmd_core(cmd)
@@ -791,7 +791,7 @@ get_eval_string_core(obj, enc_flag, self)
return fromDefaultEnc_toUTF8(rb_str_new2(rb_id2name(SYM2ID(obj))), self);
}
} else {
-#ifdef RUBY_VM
+#ifdef HAVE_RB_SYM_TO_S
return rb_sym_to_s(obj);
#else
return rb_str_new2(rb_id2name(SYM2ID(obj)));