[commit: ghc] ghc-7.8: Follow hs_popcntX changes in ghc-prim (0e3a551)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/0e3a5514288ee37da185b58199f4684c6f2efa01/ghc

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

commit 0e3a5514288ee37da185b58199f4684c6f2efa01
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Sat Mar 22 18:29:29 2014 +0100

    Follow hs_popcntX changes in ghc-prim
    
    (cherry picked from commit 1a63f17f19a6c83980efe453966eac1cf441b277)


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

0e3a5514288ee37da185b58199f4684c6f2efa01
 includes/stg/Prim.h |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/stg/Prim.h b/includes/stg/Prim.h
index 2b23c3d..7d94d18 100644
--- a/includes/stg/Prim.h
+++ b/includes/stg/Prim.h
@@ -22,14 +22,14 @@ StgWord64 hs_bswap64(StgWord64 x);
 /* TODO: longlong.c */
 
 /* libraries/ghc-prim/cbits/popcnt.c */
-StgWord hs_popcnt8(StgWord8 x);
-StgWord hs_popcnt16(StgWord16 x);
-StgWord hs_popcnt32(StgWord32 x);
+StgWord hs_popcnt8(StgWord x);
+StgWord hs_popcnt16(StgWord x);
+StgWord hs_popcnt32(StgWord x);
 StgWord hs_popcnt64(StgWord64 x);
 #ifdef i386_HOST_ARCH
-StgWord hs_popcnt(StgWord32 x);
+StgWord hs_popcnt(StgWord x);
 #else
-StgWord hs_popcnt(StgWord64 x);
+StgWord hs_popcnt(StgWord x);
 #endif
 
 /* libraries/ghc-prim/cbits/word2float.c */