* gc.c (HEAP_ALIGN, HEAP_ALIGN_MASK): DRY, let compiler calculate

from HEAP_ALIGN_LOG. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
fgo · Jan 27, 2012 · a92dd46 · a92dd46
1 parent 68bf801
commit a92dd46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 27 16:31:45 2012  Nobuyoshi Nakada  <[email protected]>
+
+	* gc.c (HEAP_ALIGN, HEAP_ALIGN_MASK): DRY, let compiler calculate
+	  from HEAP_ALIGN_LOG.
+
 Thu Jan 26 11:03:37 2012  Eric Hodel  <[email protected]>
 
 	* lib/matrix.rb:  Clean up extra whitespace in output documentation.

diff --git a/gc.c b/gc.c
@@ -538,8 +538,8 @@ rb_objspace_free(rb_objspace_t *objspace)
 
 /* tiny heap size: 16KB */
 #define HEAP_ALIGN_LOG 14
-#define HEAP_ALIGN 0x4000
-#define HEAP_ALIGN_MASK 0x3fff
+#define HEAP_ALIGN (1UL << HEAP_ALIGN_LOG)
+#define HEAP_ALIGN_MASK (~(~0UL << HEAP_ALIGN_LOG))
 #define REQUIRED_SIZE_BY_MALLOC (sizeof(size_t) * 5)
 #define HEAP_SIZE (HEAP_ALIGN - REQUIRED_SIZE_BY_MALLOC)