From efeb2b2c641ddac89566f5fbb1507d905ac79403 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 19 Feb 2011 13:31:42 +0000 Subject: [PATCH] Roll back generics changes in the HEAD repos --- GHC/Base.lhs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/GHC/Base.lhs b/GHC/Base.lhs index 1a5ce0d..be1b57b 100644 --- a/GHC/Base.lhs +++ b/GHC/Base.lhs @@ -97,8 +97,7 @@ module GHC.Base ( module GHC.Base, module GHC.Classes, - --module GHC.Generics, -- JPM: We no longer export GHC.Generics - -- by default to avoid name clashes + module GHC.Generics, module GHC.Ordering, module GHC.Types, module GHC.Prim, -- Re-export GHC.Prim and GHC.Err, to avoid lots @@ -108,8 +107,7 @@ module GHC.Base import GHC.Types import GHC.Classes --- JPM: Since we don't export it, we don't need to import GHC.Generics ---import GHC.Generics +import GHC.Generics import GHC.Ordering import GHC.Prim import {-# SOURCE #-} GHC.Show -- 1.7.10.4