Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/265af43ffd4411f4fced30ac866ef6bb49efec6c

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

commit 265af43ffd4411f4fced30ac866ef6bb49efec6c
Author: Simon Marlow <marlo...@gmail.com>
Date:   Thu Dec 13 22:18:49 2012 +0000

    Make enabled_capabilities visible (fixes dynamic linking)

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

 includes/rts/Threads.h |    3 +++
 rts/Capability.h       |    3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/rts/Threads.h b/includes/rts/Threads.h
index 60d9bc4..2ebc542 100644
--- a/includes/rts/Threads.h
+++ b/includes/rts/Threads.h
@@ -57,6 +57,9 @@ HsBool rtsSupportsBoundThreads (void);
 // The number of Capabilities
 extern unsigned int n_capabilities;
 
+// The number of Capabilities that are not disabled
+extern nat enabled_capabilities;
+
 #if !IN_STG_CODE
 extern Capability MainCapability;
 #endif
diff --git a/rts/Capability.h b/rts/Capability.h
index 1b3c06f..3348f88 100644
--- a/rts/Capability.h
+++ b/rts/Capability.h
@@ -207,8 +207,7 @@ INLINE_HEADER void releaseCapability_ (Capability* cap 
STG_UNUSED,
 
 // declared in includes/rts/Threads.h:
 // extern nat n_capabilities;
-
-extern nat enabled_capabilities;
+// extern nat enabled_capabilities;
 
 // Array of all the capabilities
 //



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to