* ruby.h: define RUBY_VM macro and remove NATIVETHREAD* macros.

* intern.h: ditto.
* signal.c (posix_signal): remove unused function
  posix_nativethread_signal().



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-02-25 02:43:43 +00:00
parent 571317ee30
commit 757ed3ccf1
4 changed files with 11 additions and 38 deletions

View File

@ -1,3 +1,12 @@
Sun Feb 25 11:38:40 2007 Koichi Sasada <ko1@atdot.net>
* ruby.h: define RUBY_VM macro and remove NATIVETHREAD* macros.
* intern.h: ditto.
* signal.c (posix_signal): remove unused function
posix_nativethread_signal().
Sun Feb 25 11:31:13 2007 Koichi Sasada <ko1@atdot.net>
* thread.c (rb_thread_run): fix to ANSI style.

View File

@ -469,10 +469,6 @@ void rb_gc_mark_trap_list(void);
#ifdef POSIX_SIGNAL
#define posix_signal ruby_posix_signal
void posix_signal(int, RETSIGTYPE (*)(int));
#ifdef HAVE_NATIVETHREAD
#define posix_nativethread_signal ruby_posix_nativethread_signal
void posix_nativethread_signal(int, RETSIGTYPE (*)(int));
#endif
#endif
void rb_trap_exit(void);
void rb_trap_exec(void);

19
ruby.h
View File

@ -812,23 +812,8 @@ rb_special_const_p(VALUE obj)
static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
#endif
#if defined(HAVE_LIBPTHREAD)
#ifdef HAVE_PTHREAD_H
#include <pthread.h>
#endif
typedef pthread_t rb_nativethread_t;
# define NATIVETHREAD_CURRENT() pthread_self()
# define NATIVETHREAD_EQUAL(t1,t2) pthread_equal((t1),(t2))
# define HAVE_NATIVETHREAD
# define NATIVETHREAD_KILL(th,sig) pthread_kill((th),(sig))
# define HAVE_NATIVETHREAD_KILL
#elif defined(_WIN32) || defined(_WIN32_WCE)
typedef DWORD rb_nativethread_t;
# define NATIVETHREAD_CURRENT() GetCurrentThreadId()
# define NATIVETHREAD_EQUAL(t1,t2) ((t1) == (t2))
# define HAVE_NATIVETHREAD
#endif
#define RUBY_VM 1 /* YARV */
#define HAVE_NATIVETHREAD
#if defined(__cplusplus)
#if 0

View File

@ -354,23 +354,6 @@ posix_signal(int signum, sighandler_t handler)
ruby_signal(signum, handler);
}
#ifdef HAVE_NATIVETHREAD
static sighandler_t
ruby_nativethread_signal(int signum, sighandler_t handler)
{
sighandler_t old;
old = ruby_signal(signum, handler);
rb_trap_accept_nativethreads[signum] = 1;
return old;
}
void
posix_nativethread_signal(int signum, sighandler_t handler)
{
ruby_nativethread_signal(signum, handler);
}
#endif
#else /* !POSIX_SIGNAL */
#define ruby_signal(sig,handler) (rb_trap_accept_nativethreads[sig] = 0, signal((sig),(handler)))
#ifdef HAVE_NATIVETHREAD