1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

2000-06-22

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2000-06-22 04:39:08 +00:00
parent 2cc44e7606
commit fac7f59b31
3 changed files with 14 additions and 14 deletions

View file

@ -1,3 +1,7 @@
Thu Jun 22 13:37:19 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* eval.c (rb_thread_sleep_forever): merge pause() macro.
Tue Jun 20 10:54:19 2000 WATANABE Hirofumi <eban@os.rim.or.jp> Tue Jun 20 10:54:19 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* configure.in: add eval sitedir. * configure.in: add eval sitedir.

20
eval.c
View file

@ -69,14 +69,6 @@ struct timeval {
#include <sys/stat.h> #include <sys/stat.h>
#if !defined HAVE_PAUSE
# if defined _WIN32 && !defined __CYGWIN__
# define pause() Sleep(INFINITE)
# else
# define pause() sleep(0x7fffffff)
# endif
#endif
VALUE rb_cProc; VALUE rb_cProc;
static VALUE rb_cBinding; static VALUE rb_cBinding;
static VALUE proc_call _((VALUE,VALUE)); static VALUE proc_call _((VALUE,VALUE));
@ -7254,16 +7246,20 @@ rb_thread_sleep(sec)
rb_thread_wait_for(rb_time_timeval(INT2FIX(sec))); rb_thread_wait_for(rb_time_timeval(INT2FIX(sec)));
} }
#if !defined HAVE_PAUSE
# if defined _WIN32 && !defined __CYGWIN__
# define pause() Sleep(INFINITE)
# else
# define pause() sleep(0x7fffffff)
# endif
#endif
void void
rb_thread_sleep_forever() rb_thread_sleep_forever()
{ {
if (curr_thread == curr_thread->next) { if (curr_thread == curr_thread->next) {
TRAP_BEG; TRAP_BEG;
#ifdef HAVE_PAUSE
pause(); pause();
#else
sleep((32767<<16)+32767);
#endif
TRAP_END; TRAP_END;
return; return;
} }

View file

@ -1,4 +1,4 @@
#define RUBY_VERSION "1.5.4" #define RUBY_VERSION "1.5.4"
#define RUBY_RELEASE_DATE "2000-06-19" #define RUBY_RELEASE_DATE "2000-06-22"
#define RUBY_VERSION_CODE 154 #define RUBY_VERSION_CODE 154
#define RUBY_RELEASE_CODE 20000619 #define RUBY_RELEASE_CODE 20000622