naruse	2010-07-28 09:25:53 +0900 (Wed, 28 Jul 2010)

  New Revision: 28768

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

  Log:
    * cont.c: (RB_PAGE_SIZE): renamed from PAGE_SIZE. [ruby-dev:41870]
    
    * cont.c: (RB_PAGE_MASK): renamed from PAGE_MASK.

  Modified files:
    trunk/ChangeLog
    trunk/cont.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28767)
+++ ChangeLog	(revision 28768)
@@ -1,3 +1,9 @@
+Wed Jul 28 09:24:43 2010  NARUSE, Yui  <naruse@r...>
+
+	* cont.c: (RB_PAGE_SIZE): renamed from PAGE_SIZE. [ruby-dev:41870]
+
+	* cont.c: (RB_PAGE_MASK): renamed from PAGE_MASK.
+
 Tue Jul 27 23:09:09 2010  Tanaka Akira  <akr@f...>
 
 	* ext/pathname/pathname.c (path_taint): use rb_obj_taint.
Index: cont.c
===================================================================
--- cont.c	(revision 28767)
+++ cont.c	(revision 28768)
@@ -41,9 +41,9 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <ucontext.h>
-#endif
-#define PAGE_SIZE (pagesize)
-#define PAGE_MASK (~(PAGE_SIZE - 1))
+# clean cast warnings.endif
+#define RB_PAGE_SIZE (pagesize)
+#define RB_PAGE_MASK (~(RB_PAGE_SIZE - 1))
 static long pagesize;
 #define FIBER_MACHINE_STACK_ALLOCATION_SIZE  (0x10000 / sizeof(VALUE))
 #endif
@@ -498,7 +498,7 @@
     VALUE *ptr;
 
     SET_MACHINE_STACK_END(&ptr);
-    th->machine_stack_start = (void*)(((VALUE)ptr & PAGE_MASK) + STACK_UPPER(&ptr, 0, PAGE_SIZE));
+    th->machine_stack_start = (void*)(((VALUE)ptr & PAGE_MASK) + STACK_UPPER(&ptr, 0, RB_PAGE_SIZE));
 }
 
 static VOID CALLBACK
@@ -531,8 +531,8 @@
 	if (ptr == (VALUE*)(SIGNED_VALUE)-1) {
 	    rb_raise(rb_eFiberError, "can't alloc machine stack to fiber");
 	}
-	if (mprotect(ptr + STACK_DIR_UPPER((size - PAGE_SIZE) / sizeof(VALUE), 0),
-		     PAGE_SIZE, PROT_READ | PROT_WRITE) < 0) {
+	if (mprotect(ptr + STACK_DIR_UPPER((size - RB_PAGE_SIZE) / sizeof(VALUE), 0),
+		     RB_PAGE_SIZE, PROT_READ | PROT_WRITE) < 0) {
 	    rb_raise(rb_eFiberError, "mprotect failed");
 	}
     }

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