2 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index afe0730f4f..7ae41f2bcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Apr 24 23:40:50 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb: use [""].pack("p").size to detect the pointer size.
+
 Sat Apr 24 21:07:27 2010  Tanaka Akira  <akr@fsij.org>
 
 	* test/psych/test_psych.rb: don't leave temporary files.
diff --git a/lib/pp.rb b/lib/pp.rb
index 2fcb4af820..cda282448b 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -164,13 +164,7 @@ class PP < PrettyPrint
       group(1, '#<' + obj.class.name, '>', &block)
     end
 
-    if 0x100000000.class == Bignum
-      # 32bit
-      PointerMask = 0xffffffff
-    else
-      # 64bit
-      PointerMask = 0xffffffffffffffff
-    end
+    PointerMask = (1 << ([""].pack("p").size * 8)) - 1
 
     case Object.new.inspect
     when /\A\#<Object:0x([0-9a-f]+)>\z/