Make tyConSingleDataCon_maybe more forgiving

[ghc-hetmet.git] / includes / stg / Ticky.h

diff --git a/includes/stg/Ticky.h b/includes/stg/Ticky.h
index fd7edf8..e173aa7 100644 (file)
--- a/includes/stg/Ticky.h
+++ b/includes/stg/Ticky.h
@@ -1,9 +1,14 @@
 /* -----------------------------------------------------------------------------
  *
- * (c) The GHC Team, 2007
+ * (c) The GHC Team, 2009
  *
  * Declarations for counters used by ticky-ticky profiling.
  *
+ * Do not #include this file directly: #include "Rts.h" instead.
+ *
+ * To understand the structure of the RTS headers, see the wiki:
+ *   http://hackage.haskell.org/trac/ghc/wiki/Commentary/SourceTree/Includes
+ *
  * -------------------------------------------------------------------------- */
 
 
@@ -14,7 +19,6 @@
    keep them consistent with the macros that use them (which are
    defined in Cmm.h. */
 
-#ifdef TICKY_TICKY
 /* same trick as in the former StgTicky.h: recycle the same declarations
    for both extern decls (which are included everywhere)
    and initializations (which only happen once) */
@@ -113,8 +117,6 @@ EXTERN StgInt GC_SEL_MAJOR_ctr INIT(0);
 
 EXTERN StgInt GC_FAILED_PROMOTION_ctr INIT(0);
 
-EXTERN StgInt GC_WORDS_COPIED_ctr INIT(0);
-
 EXTERN StgInt ALLOC_UP_THK_ctr INIT(0);
 EXTERN StgInt ALLOC_SE_THK_ctr INIT(0);
 EXTERN StgInt ALLOC_THK_adm INIT(0);
@@ -159,8 +161,6 @@ EXTERN StgInt RET_SEMI_loads_avoided INIT(0);
 
 /* End of counter declarations. */
 
-#endif /* TICKY_TICKY */
-
 /* This is ugly, but the story is:
    We got rid of StgTicky.h, which was previously
    defining these macros for the benefit of C code
@@ -176,7 +176,6 @@ EXTERN StgInt RET_SEMI_loads_avoided INIT(0);
 #define TICK_UPD_NEW_IND()
 #define TICK_UPD_SQUEEZED()
 #define TICK_ALLOC_HEAP_NOCTR(x)
-#define TICK_GC_WORDS_COPIED(x)
 #define TICK_GC_FAILED_PROMOTION()
 #define TICK_ALLOC_TSO(g,s)
 #define TICK_ALLOC_UP_THK(g,s)