[commit: haddock] ghc-7.6: Use LANGUAGE pragmas instead of default-extensions in cabal file (1483f36)

[David Waern]

Repository : ssh://darcs.haskell.org//srv/darcs/haddock

On branch  : ghc-7.6

http://hackage.haskell.org/trac/ghc/changeset/1483f369caaacc25e07f9715b15e49c35205b417

>---------------------------------------------------------------

commit 1483f369caaacc25e07f9715b15e49c35205b417
Author: Simon Hengel <sol at typeful.net>
Date:   Wed May 16 13:37:02 2012 +0200

    Use LANGUAGE pragmas instead of default-extensions in cabal file

>---------------------------------------------------------------

 haddock.cabal                            |    4 ----
 src/.ghci                                |    2 +-
 src/Haddock/Interface/AttachInstances.hs |    2 +-
 src/Haddock/InterfaceFile.hs             |    2 +-
 src/Haddock/Utils.hs                     |    1 +
 src/Main.hs                              |    2 +-
 tests/unit-tests/.ghci                   |    2 +-
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/haddock.cabal b/haddock.cabal
index 9d6f1a9..609df29 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -104,8 +104,6 @@ executable haddock
 
   main-is:              Main.hs
   hs-source-dirs:       src
-  default-extensions:   CPP, DeriveDataTypeable,
-                        ScopedTypeVariables, MagicHash
   ghc-options:          -funbox-strict-fields -O2 -Wall -fwarn-tabs
 
   other-modules:
@@ -165,8 +163,6 @@ library
     build-depends: QuickCheck >= 2.1 && < 3
 
   hs-source-dirs:       src
-  default-extensions:   CPP, DeriveDataTypeable,
-                        ScopedTypeVariables, MagicHash
   ghc-options:          -funbox-strict-fields -O2 -Wall -fwarn-tabs
 
   exposed-modules:
diff --git a/src/.ghci b/src/.ghci
index f00e6d5..3e83f04 100644
--- a/src/.ghci
+++ b/src/.ghci
@@ -1 +1 @@
-:set -i../dist/build/autogen -i../dist/build/haddock/haddock-tmp/ -packageghc -optP-include -optP../dist/build/autogen/cabal_macros.h -XCPP -XDeriveDataTypeable -XScopedTypeVariables -XMagicHash
+:set -i../dist/build/autogen -i../dist/build/haddock/haddock-tmp/ -packageghc -optP-include -optP../dist/build/autogen/cabal_macros.h
diff --git a/src/Haddock/Interface/AttachInstances.hs b/src/Haddock/Interface/AttachInstances.hs
index c012f2e..d9f4350 100644
--- a/src/Haddock/Interface/AttachInstances.hs
+++ b/src/Haddock/Interface/AttachInstances.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE CPP, MagicHash #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Haddock.Interface.AttachInstances
diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs
index ebe1532..7abb058 100644
--- a/src/Haddock/InterfaceFile.hs
+++ b/src/Haddock/InterfaceFile.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 -----------------------------------------------------------------------------
 -- |
diff --git a/src/Haddock/Utils.hs b/src/Haddock/Utils.hs
index ad61e88..ef1b046 100644
--- a/src/Haddock/Utils.hs
+++ b/src/Haddock/Utils.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Haddock.Utils
diff --git a/src/Main.hs b/src/Main.hs
index 8c15661..5240682 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -Wwarn #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE CPP, ScopedTypeVariables #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Main
diff --git a/tests/unit-tests/.ghci b/tests/unit-tests/.ghci
index 1056366..dcc5b13 100644
--- a/tests/unit-tests/.ghci
+++ b/tests/unit-tests/.ghci
@@ -1 +1 @@
-:set -i../../src -i../../dist/build/autogen -i../../dist/build/haddock/haddock-tmp/ -packageghc -optP-include -optP../../dist/build/autogen/cabal_macros.h -XCPP -XDeriveDataTypeable -XScopedTypeVariables -XMagicHash
+:set -i../../src -i../../dist/build/autogen -i../../dist/build/haddock/haddock-tmp/ -packageghc -optP-include -optP../../dist/build/autogen/cabal_macros.h