From: Joachim Breitner <mail@joachim-breitner.de>
Date: Tue, 7 Oct 2014 11:11:34 +0000 (+0000)
Subject: Fix Closure Type table
X-Git-Tag: 0.5.2~5
X-Git-Url: http://git.nomeata.de/?p=ghc-heap-view.git;a=commitdiff_plain;h=6ae45f6eaedf62cb05f3420a8c0582103d6ea719

Fix Closure Type table
---

diff --git a/cbits/HeapView.c b/cbits/HeapView.c
index 24cfaa3..ccfb122 100644
--- a/cbits/HeapView.c
+++ b/cbits/HeapView.c
@@ -62,8 +62,7 @@ char *gtc_heap_view_closure_type_names[] = {
  [RET_BCO]               = "RET_BCO",
  [RET_SMALL]             = "RET_SMALL",
  [RET_BIG]               = "RET_BIG",
-#ifdef GHC_7_7
-#else
+#ifndef GHC_7_7
  [RET_DYN]               = "RET_DYN",
 #endif
  [RET_FUN]               = "RET_FUN",
@@ -75,6 +74,9 @@ char *gtc_heap_view_closure_type_names[] = {
  [BLOCKING_QUEUE]        = "BLOCKING_QUEUE",
  [MVAR_CLEAN]            = "MVAR_CLEAN",
  [MVAR_DIRTY]            = "MVAR_DIRTY",
+#ifdef GHC_7_7
+ [TVAR]                  = "TVAR",
+#endif
  [ARR_WORDS]             = "ARR_WORDS",
  [MUT_ARR_PTRS_CLEAN]    = "MUT_ARR_PTRS_CLEAN",
  [MUT_ARR_PTRS_DIRTY]    = "MUT_ARR_PTRS_DIRTY",
diff --git a/ghc-heap-view.cabal b/ghc-heap-view.cabal
index cebb4d8..e545a61 100644
--- a/ghc-heap-view.cabal
+++ b/ghc-heap-view.cabal
@@ -72,11 +72,12 @@ Library
   if flag(ghc_7_7)
     build-depends: ghc >= 7.7
     cc-options: -DGHC_7_7
+    cpp-options: -DGHC_7_7
   else
     build-depends: ghc < 7.7
   C-Sources: cbits/HeapView.c cbits/HeapViewPrim.cmm
   Hs-source-dirs: src/
-  Ghc-options: -Wall
+  Ghc-options: -Wall -dcmm-lint
 
   if flag(prim-supports-any)
     cpp-options: -DPRIM_SUPPORTS_ANY
diff --git a/src/GHC/HeapView.hs b/src/GHC/HeapView.hs
index b7055e6..0e9ef44 100644
--- a/src/GHC/HeapView.hs
+++ b/src/GHC/HeapView.hs
@@ -241,7 +241,9 @@ data ClosureType =
 	| RET_BCO
 	| RET_SMALL
 	| RET_BIG
+#ifndef GHC_7_7
 	| RET_DYN
+#endif
 	| RET_FUN
 	| UPDATE_FRAME
 	| CATCH_FRAME
@@ -251,6 +253,9 @@ data ClosureType =
 	| BLACKHOLE
 	| MVAR_CLEAN
 	| MVAR_DIRTY
+#ifdef GHC_7_7
+	| TVAR
+#endif
 	| ARR_WORDS
 	| MUT_ARR_PTRS_CLEAN
 	| MUT_ARR_PTRS_DIRTY