merge upstream HEAD

[ghc-hetmet.git] / rts / STM.h

diff --git a/rts/STM.h b/rts/STM.h
index 1f28b9c..dd11bb8 100644 (file)
--- a/rts/STM.h
+++ b/rts/STM.h
@@ -40,7 +40,7 @@
 #define STM_UNIPROC
 #endif
 
-#pragma GCC visibility push(hidden)
+#include "BeginPrivate.h"
 
 /*----------------------------------------------------------------------
 
@@ -48,7 +48,7 @@
    --------------
 */
 
-void stmPreGCHook(void);
+void stmPreGCHook(Capability *cap);
 
 /*----------------------------------------------------------------------
 
@@ -83,13 +83,6 @@ void stmFreeAbortedTRec(Capability *cap, StgTRecHeader *trec);
 
 void stmCondemnTransaction(Capability *cap, StgTRecHeader *trec);
 
-/*
- * Return the trec within which the specified trec was created (not
- * valid if trec==NO_TREC).
- */
-
-StgTRecHeader *stmGetEnclosingTRec(StgTRecHeader *trec);
-
 /*----------------------------------------------------------------------
 
    Validation
@@ -232,7 +225,7 @@ void stmWriteTVar(Capability *cap,
 
 /*----------------------------------------------------------------------*/
 
-#pragma GCC visibility pop
+#include "EndPrivate.h"
 
 #endif /* STM_H */