2000-06-22

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 14 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 91eb6f0d6..0601dd259 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* configure.in: add eval sitedir.
diff --git a/eval.c b/eval.c
index 5afb4aa48..88f51ea53 100644
--- a/eval.c
+++ b/eval.c
@@ -69,14 +69,6 @@ struct timeval {
 
 #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;
 static VALUE rb_cBinding;
 static VALUE proc_call _((VALUE,VALUE));
@@ -7254,16 +7246,20 @@ rb_thread_sleep(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
 rb_thread_sleep_forever()
 {
     if (curr_thread == curr_thread->next) {
 	TRAP_BEG;
-#ifdef HAVE_PAUSE
 	pause();
-#else
-	sleep((32767<<16)+32767);
-#endif
 	TRAP_END;
 	return;
     }
diff --git a/version.h b/version.h
index e5cbb6466..8d8fffad0 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,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_RELEASE_CODE 20000619
+#define RUBY_RELEASE_CODE 20000622