shyouhei	2009-01-15 14:33:55 +0900 (Thu, 15 Jan 2009)

  New Revision: 21522

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21522

  Log:
    merge revision(s) 18463:
    * gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.
      [ruby-core:18207]

  Modified files:
    branches/ruby_1_8_6/eval.c
    branches/ruby_1_8_6/gc.c
    branches/ruby_1_8_6/intern.h
    branches/ruby_1_8_6/node.h
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/intern.h
===================================================================
--- ruby_1_8_6/intern.h	(revision 21521)
+++ ruby_1_8_6/intern.h	(revision 21522)
@@ -238,7 +238,7 @@
 /* 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*));
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21521)
+++ ruby_1_8_6/version.h	(revision 21522)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-14"
+#define RUBY_RELEASE_DATE "2009-01-15"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090114
-#define RUBY_PATCHLEVEL 298
+#define RUBY_RELEASE_CODE 20090115
+#define RUBY_PATCHLEVEL 299
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #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[];
Index: ruby_1_8_6/eval.c
===================================================================
--- ruby_1_8_6/eval.c	(revision 21521)
+++ ruby_1_8_6/eval.c	(revision 21522)
@@ -10265,7 +10265,7 @@
     rb_thread_t th;
 {
     VALUE *pos;
-    int len;
+    size_t len;
     static VALUE tval;
 
     len = ruby_stack_length(&pos);
Index: ruby_1_8_6/gc.c
===================================================================
--- ruby_1_8_6/gc.c	(revision 21521)
+++ ruby_1_8_6/gc.c	(revision 21522)
@@ -440,7 +440,7 @@
 # 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
@@ -499,7 +499,7 @@
     (ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\
 } while (0)
 
-int
+size_t
 ruby_stack_length(p)
     VALUE **p;
 {
Index: ruby_1_8_6/node.h
===================================================================
--- ruby_1_8_6/node.h	(revision 21521)
+++ ruby_1_8_6/node.h	(revision 21522)
@@ -409,13 +409,13 @@
 
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/