X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=9bdfd2cb4cd4b92a4abc208782f01bdd3b28c447;hb=4dc0a6fa50f56444c76e84387a16b179df2549ee;hp=6812ec4057f2e2af255b9455180fe039c6ea26f8;hpb=e7e87344df2eec0e5cb742e162ebf8548df00306;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index 6812ec4..9bdfd2c 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,5 +1,5 @@
 name:           base
-version:        4.1.0.0
+version:        4.2.0.0
 license:        BSD3
 license-file:   LICENSE
 maintainer:     libraries@haskell.org
@@ -32,7 +32,7 @@ Library {
             build-depends: integer-simple
         else
             build-depends: integer-gmp
-            ghc-options: -DOPTIMISE_INTEGER_GCD_LCM
+            cpp-options: -DOPTIMISE_INTEGER_GCD_LCM
         build-depends: rts, ghc-prim
         exposed-modules:
             Foreign.Concurrent,
@@ -65,6 +65,7 @@ Library {
             GHC.IO.Encoding.UTF32,
             GHC.IO.Encoding.Types,
             GHC.IO.Encoding.Iconv,
+            GHC.IO.Encoding.CodePage,
             GHC.IO.Handle,
             GHC.IO.Handle.Types,
             GHC.IO.Handle.Internals,
@@ -92,6 +93,8 @@ Library {
             GHC.Weak,
             GHC.Word,
             System.Timeout
+        if os(windows)
+            exposed-modules: GHC.IO.Encoding.CodePage.Table
         extensions: MagicHash, ExistentialQuantification, Rank2Types,
                     ScopedTypeVariables, UnboxedTuples,
                     ForeignFunctionInterface, UnliftedFFITypes,
@@ -133,6 +136,7 @@ Library {
         Data.Fixed,
         Data.Foldable
         Data.Function,
+        Data.Functor,
         Data.HashTable,
         Data.IORef,
         Data.Int,