From 363cad32618389ea30afa9db3eb6f74b623f232c Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 9 Aug 2008 23:56:17 +0000 Subject: * 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@18463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- eval.c | 2 +- gc.c | 4 ++-- intern.h | 2 +- node.h | 8 ++++---- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fb1304e5e..44df04ddd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Sun Aug 10 08:15:05 2008 Nobuyoshi Nakada +Sun Aug 10 08:56:14 2008 Nobuyoshi Nakada + + * gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t. + [ruby-core:18207] * configure.in (rb_cv_missing__dtos18, rb_cv_missing_fconvert), ext/digest/md5/md5.c, ext/openssl/ossl.c (main), diff --git a/eval.c b/eval.c index e0b9db6bd3..36a07ede23 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 dc4184ceba..ffbaa99299 100644 --- a/gc.c +++ b/gc.c @@ -490,7 +490,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 @@ -549,7 +549,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 -- cgit v1.2.3