summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-25 07:28:51 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-25 07:28:51 +0000
commitb79c8682960eef9d78a9c6e9c34dc966951bf45e (patch)
treedafc232ad589926fc75187211ab0affba010e77c
parented7b25a85436cff446779f580e859da94cd4d9d8 (diff)
* include/ruby/ruby.h, thread.c: rename is_ruby_native_thread() to
ruby_native_thread_p(). * ext/tk/tcltklib.c: apply it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/tk/tcltklib.c16
-rw-r--r--include/ruby/ruby.h2
-rw-r--r--thread.c2
4 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index ca8b35d8e2..ac7b852142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 25 16:26:48 2007 Koichi Sasada <ko1@atdot.net>
+
+ * include/ruby/ruby.h, thread.c: rename is_ruby_native_thread() to
+ ruby_native_thread_p().
+
+ * ext/tk/tcltklib.c: apply it.
+
Tue Dec 25 16:15:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (clean-enc): clean encoding objects.
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index baa28c9640..df70e67c9d 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -1298,7 +1298,7 @@ eventloop_sleep(dummy)
#if 0
#ifdef HAVE_NATIVETHREAD
- if (!is_ruby_native_thread()) {
+ if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on eventloop_sleep()");
}
#endif
@@ -1310,7 +1310,7 @@ eventloop_sleep(dummy)
#if 0
#ifdef HAVE_NATIVETHREAD
- if (!is_ruby_native_thread()) {
+ if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on eventloop_sleep()");
}
#endif
@@ -2457,7 +2457,7 @@ tcl_protect(interp, proc, data)
#if 0
#ifdef HAVE_NATIVETHREAD
- if (!is_ruby_native_thread()) {
+ if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on tcl_protect()");
}
#endif
@@ -2866,7 +2866,7 @@ ip_rbUpdateCommand(clientData, interp, objc, objv)
}
#if 0
#ifdef HAVE_NATIVETHREAD
- if (!is_ruby_native_thread()) {
+ if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on ip_ruby_eval()");
}
#endif
@@ -3015,7 +3015,7 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
}
#if 0
#ifdef HAVE_NATIVETHREAD
- if (!is_ruby_native_thread()) {
+ if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on ip_ruby_eval()");
}
#endif
@@ -3194,7 +3194,7 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
Tcl_Preserve(interp);
#if 0
#ifdef HAVE_NATIVETHREAD
- if (!is_ruby_native_thread()) {
+ if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on ip_ruby_eval()");
}
#endif
@@ -5964,7 +5964,7 @@ eval_queue_handler(evPtr, flags)
if (rb_safe_level() != q->safe_level) {
#if 0
#ifdef HAVE_NATIVETHREAD
- if (!is_ruby_native_thread()) {
+ if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on eval_queue_handler()");
}
#endif
@@ -8384,7 +8384,7 @@ Init_tcltklib()
/* if ruby->nativethread-supprt and tcltklib->doen't,
the following will cause link-error. */
- is_ruby_native_thread();
+ ruby_native_thread_p();
/* --------------------------------------------------------------- */
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 72d695a2bc..90402afeec 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -946,7 +946,7 @@ void ruby_sysinit(int *, char ***);
#define RUBY_VM 1 /* YARV */
#define HAVE_NATIVETHREAD
-int is_ruby_native_thread(void);
+int ruby_native_thread_p(void);
#define RUBY_EVENT_NONE 0x00
#define RUBY_EVENT_LINE 0x01
diff --git a/thread.c b/thread.c
index 1a1d3661c3..8e0bd9db3b 100644
--- a/thread.c
+++ b/thread.c
@@ -3119,7 +3119,7 @@ Init_Thread(void)
}
int
-is_ruby_native_thread(void)
+ruby_native_thread_p(void)
{
rb_thread_t *rb_thread_check_ptr(rb_thread_t *ptr);
rb_thread_t *th = ruby_thread_from_native();