aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-20 23:55:09 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-20 23:55:09 +0000
commitfd8734a64d3de5a6d94061633ed719f068c1e723 (patch)
tree91c586bd5b09e2e4e237f8d9ab4941713cee3d40
parent45acd59d2db8ec12a0a048b1c79ebb8acf68b995 (diff)
downloadruby-fd8734a64d3de5a6d94061633ed719f068c1e723.tar.gz
* gc.c (ruby_xmalloc): use size_t for malloc argument instead of long.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c2
-rw-r--r--version.h6
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 737801355b..96fde4af8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 21 08:54:30 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * gc.c (ruby_xmalloc): use size_t for malloc argument instead of long.
+
Sun Apr 20 21:00:21 2008 Akinori MUSHA <knu@iDaemons.org>
* enumerator.c, include/ruby/ruby.h: Export rb_cEnumerator.
diff --git a/gc.c b/gc.c
index 1a826fbc54..ce1878e654 100644
--- a/gc.c
+++ b/gc.c
@@ -314,7 +314,7 @@ ruby_xmalloc(size_t size)
void *
ruby_xmalloc2(size_t n, size_t size)
{
- long len = size * n;
+ size_t len = size * n;
if (n != 0 && size != len / n) {
rb_raise(rb_eArgError, "malloc: possible integer overflow");
}
diff --git a/version.h b/version.h
index 918fbad281..bac42999d0 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-04-20"
+#define RUBY_RELEASE_DATE "2008-04-21"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080420
+#define RUBY_RELEASE_CODE 20080421
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 21
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];