[commit: base] master: FIX BUILD on 32-bits (195657a)

[Daniel Fischer]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/195657a3e1947b4ed132780ee644e72ecc4c60e2

>---------------------------------------------------------------

commit 195657a3e1947b4ed132780ee644e72ecc4c60e2
Author: Daniel Fischer <daniel.is.fischer at googlemail.com>
Date:   Sat Aug 27 17:38:17 2011 +0200

    FIX BUILD on 32-bits
    
    popCount had the wrong type for Int64 on 32-bit systems.

>---------------------------------------------------------------

 GHC/Int.hs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/GHC/Int.hs b/GHC/Int.hs
index 71ade81..d29c10b 100644
--- a/GHC/Int.hs
+++ b/GHC/Int.hs
@@ -630,7 +630,7 @@ instance Bits Int64 where
     bitSize  _                 = 64
     isSigned _                 = True
     popCount (I64# x#)         =
-        I64# (word64ToInt64# (popCnt64# (int64ToWord64# x#)))
+        I# (word2Int# (popCnt64# (int64ToWord64# x#)))
 
 -- give the 64-bit shift operations the same treatment as the 32-bit
 -- ones (see GHC.Base), namely we wrap them in tests to catch the