summaryrefslogtreecommitdiff
path: root/compiler/ghci/ByteCodeInstr.lhs
diff options
context:
space:
mode:
authorSimon Marlow <simonmar@microsoft.com>2006-12-12 10:36:23 +0000
committerSimon Marlow <simonmar@microsoft.com>2006-12-12 10:36:23 +0000
commit7cca410a40cccf0fbeda2155f307baa5619b8130 (patch)
tree9000c4ad684d2f065eab272a30c1216509705ba7 /compiler/ghci/ByteCodeInstr.lhs
parentc667b12e4225d99cee8d3ae14e61c2e015fa38e0 (diff)
downloadhaskell-7cca410a40cccf0fbeda2155f307baa5619b8130.tar.gz
MERGE: Fix Windows DEP violations (bug #885)
Original patch by brianlsmith@gmail.com
Diffstat (limited to 'compiler/ghci/ByteCodeInstr.lhs')
-rw-r--r--compiler/ghci/ByteCodeInstr.lhs4
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/ghci/ByteCodeInstr.lhs b/compiler/ghci/ByteCodeInstr.lhs
index c1aafc95cf..5239139eb2 100644
--- a/compiler/ghci/ByteCodeInstr.lhs
+++ b/compiler/ghci/ByteCodeInstr.lhs
@@ -11,6 +11,8 @@ module ByteCodeInstr (
#include "HsVersions.h"
#include "../includes/MachDeps.h"
+import ByteCodeItbls ( ItblPtr )
+
import Outputable
import Name
import Id
@@ -38,7 +40,7 @@ data ProtoBCO a
-- what the BCO came from
protoBCOExpr :: Either [AnnAlt Id VarSet] (AnnExpr Id VarSet),
-- malloc'd pointers
- protoBCOPtrs :: [Ptr ()]
+ protoBCOPtrs :: [Either ItblPtr (Ptr ())]
}
type LocalLabel = Int