summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-01-28 07:55:30 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-01-28 07:55:30 +0000
commit2344efc3835c3226fa06a85e6f3b1871415b8ad1 (patch)
treedd3d4a93fd65901cd3b8e361717a6b694ef4be2b
parent1f25ed85a9a066ecff452df1512a42de04666053 (diff)
990128
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--bignum.c2
-rw-r--r--instruby.rb2
-rw-r--r--io.c2
-rw-r--r--lib/profile.rb2
-rw-r--r--version.h2
-rw-r--r--win32/ruby.def1
-rw-r--r--win32/win32.h8
8 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index e02772075b..528d2c117e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 27 17:50:02 1999 Kazuhiro HIWADA <hiwada@kuee.kyoto-u.ac.jp>
+
+ * bignum.c (dbl2big): raised error if double is too big to cast
+ into long. check added.
+
Wed Jan 27 03:16:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
* variable.c (rb_mod_const_at): can't list constants of the
diff --git a/bignum.c b/bignum.c
index 6b0e78729b..3671dae8d9 100644
--- a/bignum.c
+++ b/bignum.c
@@ -396,7 +396,7 @@ rb_dbl2big(d)
VALUE z;
double u = (d < 0)?-d:d;
- while (0 != (long)u) {
+ while (!POSFIXABLE(u) || 0 != (long)u) {
u /= (double)(BIGRAD);
i++;
}
diff --git a/instruby.rb b/instruby.rb
index ec79c6cb56..3b79d40e25 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -59,7 +59,7 @@ File.makedirs(archdir,true)
for f in Dir["*.h"]
File.install f, "#{destdir}#{archdir}", 0644, true
end
-File.install CONFIG['LIBRUBY_A'], "#{destdir}#{archdir}", 0644, true
+File.install pwd+'/'+CONFIG['LIBRUBY_A'], "#{destdir}#{archdir}", 0644, true
File.makedirs "#{destdir}#{mandir}", true
File.install "ruby.1", "#{destdir}#{mandir}", 0644, true
diff --git a/io.c b/io.c
index d43286d085..8a2162c030 100644
--- a/io.c
+++ b/io.c
@@ -20,7 +20,7 @@
#if !defined(DJGPP) && !defined(NT) && !defined(__human68k__)
#include <sys/ioctl.h>
#endif
-#if defined(HAVE_FCNTL)
+#if defined(HAVE_FCNTL) || defined(NT)
#include <fcntl.h>
#endif
diff --git a/lib/profile.rb b/lib/profile.rb
index 3abcc37662..3634b5bdc2 100644
--- a/lib/profile.rb
+++ b/lib/profile.rb
@@ -16,6 +16,7 @@ module Profiler__
data = MAP[id]
unless data
name = klass.to_s
+ if name.nil? then name = '' end
if klass.kind_of? Class
name += "#"
else
@@ -34,6 +35,7 @@ module Profiler__
END {
set_trace_func nil
total = Float(Time.times[0]) - Start
+ if total == 0 then total = 0.01 end
MAP[:toplevel][1] = total
# f = open("./rmon.out", "w")
f = STDERR
diff --git a/version.h b/version.h
index d96cab4a2e..4f77a76b94 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
#define RUBY_VERSION "1.3.1"
-#define VERSION_DATE "99/01/27"
+#define VERSION_DATE "99/01/28"
diff --git a/win32/ruby.def b/win32/ruby.def
index dfe63e5ba6..3c6f9c3e56 100644
--- a/win32/ruby.def
+++ b/win32/ruby.def
@@ -401,7 +401,6 @@ EXPORTS
rb_test_false_or_nil
ruby_scan_oct
ruby_scan_hex
- rb_add_suffix
;variable.c
rb_class_path
rb_set_class_path
diff --git a/win32/win32.h b/win32/win32.h
index 9f0dcfbba0..8304946eaf 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -145,6 +145,10 @@
#endif
#define utime _utime
#define vsnprintf _vsnprintf
+#define snprintf _snprintf
+#define popen _popen
+#define pclose _pclose
+#define strcasecmp _strcmpi
/* these are defined in nt.c */
@@ -214,10 +218,6 @@ extern char *mystrerror(int);
#define EWOULDBLOCK 10035 /* EBASEERR + 35 (winsock.h) */
#endif
-#ifndef O_BINARY
-#define O_BINARY 0x8000
-#endif
-
#ifdef popen
#undef popen
#define popen mypopen