File ruby-18svn-r18463.patch of Package ruby

Sun Aug 10 08:56:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
	* gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.
	  [ruby-core:18207]


Index: intern.h
===================================================================
--- intern.h	(revision 18462)
+++ intern.h	(revision 18463)
@@ -251,7 +251,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: ChangeLog
===================================================================
Index: eval.c
===================================================================
--- eval.c	(revision 18462)
+++ eval.c	(revision 18463)
@@ -10548,7 +10548,7 @@
     rb_thread_t th;
 {
     VALUE *pos;
-    int len;
+    size_t len;
     static VALUE tval;
 
     len = ruby_stack_length(&pos);
Index: gc.c
===================================================================
--- gc.c	(revision 18462)
+++ gc.c	(revision 18463)
@@ -490,7 +490,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
@@ -549,7 +549,7 @@
     (ret) = (STACK_LENGTH > STACK_LEVEL_MAX - GC_WATER_MARK);\
 } while (0)
 
-int
+size_t
 ruby_stack_length(p)
     VALUE **p;
 {
Index: node.h
===================================================================
--- node.h	(revision 18462)
+++ node.h	(revision 18463)
@@ -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
openSUSE Build Service is sponsored by