[commit: base] master: getNumCapabilities should read enabled_capabilities (#7491) (fa55000)

[Simon Marlow]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/fa55000b516b05387ee9f84f132668e6c10e9243

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

commit fa55000b516b05387ee9f84f132668e6c10e9243
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Dec 11 09:31:15 2012 +0000

    getNumCapabilities should read enabled_capabilities (#7491)

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

 GHC/Conc/Sync.lhs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GHC/Conc/Sync.lhs b/GHC/Conc/Sync.lhs
index 4434f0c..6646e7c 100644
--- a/GHC/Conc/Sync.lhs
+++ b/GHC/Conc/Sync.lhs
@@ -291,7 +291,7 @@ this value, use 'setNumCapabilities'.
 -}
 getNumCapabilities :: IO Int
 getNumCapabilities = do
-   n <- peek n_capabilities
+   n <- peek enabled_capabilities
    return (fromIntegral n)
 
 {- |
@@ -322,7 +322,7 @@ foreign import ccall unsafe "getNumberOfProcessors"
 numSparks :: IO Int
 numSparks = IO $ \s -> case numSparks# s of (# s', n #) -> (# s', I# n #)
 
-foreign import ccall "&n_capabilities" n_capabilities :: Ptr CInt
+foreign import ccall "&enabled_capabilities" enabled_capabilities :: Ptr CInt
 
 childHandler :: SomeException -> IO ()
 childHandler err = catchException (real_handler err) childHandler