summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 05:40:26 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 05:40:26 +0000
commit3c848f79b7eb5ad26b57c4d9edde577cc1ba7026 (patch)
tree493b93e7ae16b3f6d980cca27bf8e7e4769d3d06
parent5d3598a1cc5e3668af9935804cf4dafbf84999b0 (diff)
merge revision(s) 18463:
* gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t. [ruby-core:18207] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval.c2
-rw-r--r--gc.c4
-rw-r--r--intern.h2
-rw-r--r--node.h8
-rw-r--r--version.h8
6 files changed, 16 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d9d2d9089..d98cfcc88c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 15 14:34:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.
+ [ruby-core:18207]
Wed Jan 14 10:39:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* stable/ext/socket/socket.c (NI_MAXHOST, NI_MAXSERV): fixed invalid
diff --git a/eval.c b/eval.c
index d2a2556494..1df4d28841 100644
--- a/eval.c
+++ b/eval.c
@@ -10548,7 +10548,7 @@ rb_thread_save_context(th)
rb_thread_t th;
{
VALUE *pos;
- int len;
+ size_t len;
static VALUE tval;
len = ruby_stack_length(&pos);
diff --git a/gc.c b/gc.c
index 445041aa92..6edd5b433f 100644
--- a/gc.c
+++ b/gc.c
@@ -480,7 +480,7 @@ unsigned int _stacksize = 262144;
# define STACK_LEVEL_MAX (_stacksize - 4096)
# undef HAVE_GETRLIMIT
#elif defined(HAVE_GETRLIMIT) || defined(_WIN32)
-static unsigned int STACK_LEVEL_MAX = 655300;
+static size_t STACK_LEVEL_MAX = 655300;
#else
# define STACK_LEVEL_MAX 655300
#endif
@@ -539,7 +539,7 @@ stack_grow_direction(addr)
(ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\
} while (0)
-int
+size_t
ruby_stack_length(p)
VALUE **p;
{
diff --git a/intern.h b/intern.h
index 7e72dd5537..00bb8f16b5 100644
--- a/intern.h
+++ b/intern.h
@@ -251,7 +251,7 @@ VALUE rb_file_directory_p _((VALUE,VALUE));
/* gc.c */
NORETURN(void rb_memerror __((void)));
int ruby_stack_check _((void));
-int ruby_stack_length _((VALUE**));
+size_t ruby_stack_length _((VALUE**));
int rb_during_gc _((void));
char *rb_source_filename _((const char*));
void rb_gc_mark_locations _((VALUE*, VALUE*));
diff --git a/node.h b/node.h
index 10ab4855c7..ec16febf9e 100644
--- a/node.h
+++ b/node.h
@@ -409,13 +409,13 @@ struct rb_thread {
VALUE result;
- long stk_len;
- long stk_max;
+ size_t stk_len;
+ size_t stk_max;
VALUE *stk_ptr;
VALUE *stk_pos;
#ifdef __ia64
- long bstr_len;
- long bstr_max;
+ size_t bstr_len;
+ size_t bstr_max;
VALUE *bstr_ptr;
VALUE *bstr_pos;
#endif
diff --git a/version.h b/version.h
index 19bc4c1b36..57c62e2cd6 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-14"
+#define RUBY_RELEASE_DATE "2009-01-15"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090114
-#define RUBY_PATCHLEVEL 85
+#define RUBY_RELEASE_CODE 20090115
+#define RUBY_PATCHLEVEL 86
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 15
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];