From 76d09411e9db597c537bd39124db47cde2d6f3c4 Mon Sep 17 00:00:00 2001 From: eban Date: Sun, 4 Jun 2000 15:32:19 +0000 Subject: [PATCH] see ChangeLog git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ bignum.c | 5 +++++ eval.c | 2 +- version.h | 4 ++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dec011884e..176669215b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Jun 5 00:18:08 2000 WATANABE Hirofumi + + * bignum.c: avoid conflict with USHORT on mingw32. + +Mon Jun 5 00:13:35 2000 WATANABE Hirofumi + + * eval.c (rb_thread_schedule): =/== typo. + Sun Jun 4 03:17:36 2000 Wakou Aoyama * lib/cig.rb: improve: CGI::pretty() diff --git a/bignum.c b/bignum.c index 8fb3d39406..f4f387cd20 100644 --- a/bignum.c +++ b/bignum.c @@ -15,6 +15,11 @@ #include VALUE rb_cBignum; + +#if defined __MINGW32__ +#define USHORT _USHORT +#endif + typedef unsigned short USHORT; #define BDIGITS(x) ((USHORT*)RBIGNUM(x)->digits) diff --git a/eval.c b/eval.c index 429915705c..814924b83a 100644 --- a/eval.c +++ b/eval.c @@ -6828,7 +6828,7 @@ rb_thread_schedule() n = select(max+1, &readfds, &writefds, &exceptfds, delay_ptr); if (n < 0) { if (rb_trap_pending) rb_trap_exec(); - if (errno = EINTR) goto again; + if (errno == EINTR) goto again; FOREACH_THREAD(th) { if (th->wait_for & WAIT_SELECT) { int v = 0; diff --git a/version.h b/version.h index ae16b6ba67..4eba36d043 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.5.4" -#define RUBY_RELEASE_DATE "2000-06-01" +#define RUBY_RELEASE_DATE "2000-06-05" #define RUBY_VERSION_CODE 154 -#define RUBY_RELEASE_CODE 20000601 +#define RUBY_RELEASE_CODE 20000605