merge upstream HEAD
[ghc-hetmet.git] / rts / STM.h
index eae93b2..dd11bb8 100644 (file)
--- a/rts/STM.h
+++ b/rts/STM.h
@@ -40,7 +40,7 @@
 #define STM_UNIPROC
 #endif
 
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
 
 /*----------------------------------------------------------------------
 
@@ -48,7 +48,7 @@ BEGIN_RTS_PRIVATE
    --------------
 */
 
-void stmPreGCHook(void);
+void stmPreGCHook(Capability *cap);
 
 /*----------------------------------------------------------------------
 
@@ -225,7 +225,7 @@ void stmWriteTVar(Capability *cap,
 
 /*----------------------------------------------------------------------*/
 
-END_RTS_PRIVATE
+#include "EndPrivate.h"
 
 #endif /* STM_H */