X-Git-Url: http://git.megacz.com/?p=ghc-base.git;a=blobdiff_plain;f=GHC%2FBase.lhs;h=1a5ce0d45ab70326121605a2d0cd88c2b84ab596;hp=be1b57bbd55340da8239f933fc367dc0910657a2;hb=dfbc01d590acb27e9b40df1693e888531376738e;hpb=55d724b80db03d10662c0dad57f2d31c55aae35e

diff --git a/GHC/Base.lhs b/GHC/Base.lhs
index be1b57b..1a5ce0d 100644
--- a/GHC/Base.lhs
+++ b/GHC/Base.lhs
@@ -97,7 +97,8 @@ module GHC.Base
         (
         module GHC.Base,
         module GHC.Classes,
-        module GHC.Generics,
+        --module GHC.Generics,        -- JPM: We no longer export GHC.Generics
+                                      -- by default to avoid name clashes
         module GHC.Ordering,
         module GHC.Types,
         module GHC.Prim,        -- Re-export GHC.Prim and GHC.Err, to avoid lots
@@ -107,7 +108,8 @@ module GHC.Base
 
 import GHC.Types
 import GHC.Classes
-import GHC.Generics
+-- JPM: Since we don't export it, we don't need to import GHC.Generics
+--import GHC.Generics
 import GHC.Ordering
 import GHC.Prim
 import {-# SOURCE #-} GHC.Show