From b33ea38a9bd76f6ee482802b18f8ce2dd344309b Mon Sep 17 00:00:00 2001 From: nagai Date: Thu, 20 Nov 2003 04:39:08 +0000 Subject: [PATCH] * ruby.h: define is_ruby_native_thread() for no native thread environment * eval.c: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ eval.c | 7 ++++++- ruby.h | 2 -- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e42d19407..bc9b73b9cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 20 13:37:34 2003 Hidetoshi NAGAI + + * ruby.h: define is_ruby_native_thread() for no native thread + environment + + * eval.c: ditto + Thu Nov 20 12:42:47 2003 Hidetoshi NAGAI * configure.in: always check existence of the pthread library diff --git a/eval.c b/eval.c index ecb1725cc1..597ce03c29 100644 --- a/eval.c +++ b/eval.c @@ -1159,11 +1159,16 @@ void Init_ext _((void)); #ifdef HAVE_NATIVETHREAD static rb_nativethread_t ruby_thid; +#endif + int is_ruby_native_thread() { +#ifdef HAVE_NATIVETHREAD return NATIVETHREAD_EQUAL(ruby_thid, NATIVETHREAD_CURRENT()); -} +#else + return 1; #endif +} void ruby_init() diff --git a/ruby.h b/ruby.h index 7bac5db499..9818a3e149 100644 --- a/ruby.h +++ b/ruby.h @@ -682,9 +682,7 @@ typedef DWORD rb_nativethread_t; # define NATIVETHREAD_EQUAL(t1,t2) ((t1) == (t2)) # define HAVE_NATIVETHREAD #endif -#ifdef HAVE_NATIVETHREAD RUBY_EXTERN int is_ruby_native_thread(); -#endif #if defined(__cplusplus) } /* extern "C" { */