[commit: packages/base] master: Add missing/remove redundant `{-# LANGUAGE CPP #-}`s (a9f4716)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/base

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a9f47168716e9799b4a1036aca703969c7321e55/base

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

commit a9f47168716e9799b4a1036aca703969c7321e55
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Sep 28 17:35:30 2013 +0200

    Add missing/remove redundant `{-# LANGUAGE CPP #-}`s
    
    The `CPP` forgotten were in windows-specific modules, and the redundant
    `CPP` files were removed in some `.hsc` files.
    
    Note: `.hsc` files only require `{-# LANGUAGE CPP #-}` annotations if
    they use `##`, as `hsc2hs` removes all non-escaped `#`-directives.
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>


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

a9f47168716e9799b4a1036aca703969c7321e55
 GHC/Conc/Windows.hs               |    2 +-
 GHC/Event/EPoll.hsc               |    3 +--
 GHC/Event/KQueue.hsc              |    3 +--
 GHC/Event/Poll.hsc                |    3 +--
 GHC/IO/Encoding/CodePage/API.hs   |    2 +-
 GHC/IO/Encoding/CodePage/Table.hs |    2 +-
 GHC/Stats.hsc                     |    1 -
 base.cabal                        |    1 -
 codepages/MakeTable.hs            |    2 +-
 9 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/GHC/Conc/Windows.hs b/GHC/Conc/Windows.hs
index 41502f0..ad60a07 100644
--- a/GHC/Conc/Windows.hs
+++ b/GHC/Conc/Windows.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE Trustworthy #-}
-{-# LANGUAGE NoImplicitPrelude, MagicHash, UnboxedTuples, DeriveDataTypeable #-}
+{-# LANGUAGE CPP, NoImplicitPrelude, MagicHash, UnboxedTuples, DeriveDataTypeable #-}
 {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
diff --git a/GHC/Event/EPoll.hsc b/GHC/Event/EPoll.hsc
index 11392b1..fc81441 100644
--- a/GHC/Event/EPoll.hsc
+++ b/GHC/Event/EPoll.hsc
@@ -1,6 +1,5 @@
 {-# LANGUAGE Trustworthy #-}
-{-# LANGUAGE CPP
-           , GeneralizedNewtypeDeriving
+{-# LANGUAGE GeneralizedNewtypeDeriving
            , NoImplicitPrelude
            , BangPatterns
   #-}
diff --git a/GHC/Event/KQueue.hsc b/GHC/Event/KQueue.hsc
index 74e4111..b2132f6 100644
--- a/GHC/Event/KQueue.hsc
+++ b/GHC/Event/KQueue.hsc
@@ -1,6 +1,5 @@
 {-# LANGUAGE Trustworthy #-}
-{-# LANGUAGE CPP
-           , CApiFFI
+{-# LANGUAGE CApiFFI
            , GeneralizedNewtypeDeriving
            , NoImplicitPrelude
            , RecordWildCards
diff --git a/GHC/Event/Poll.hsc b/GHC/Event/Poll.hsc
index a773498..665949b 100644
--- a/GHC/Event/Poll.hsc
+++ b/GHC/Event/Poll.hsc
@@ -1,6 +1,5 @@
 {-# LANGUAGE Trustworthy #-}
-{-# LANGUAGE CPP
-           , GeneralizedNewtypeDeriving
+{-# LANGUAGE GeneralizedNewtypeDeriving
            , NoImplicitPrelude
            , BangPatterns
   #-}
diff --git a/GHC/IO/Encoding/CodePage/API.hs b/GHC/IO/Encoding/CodePage/API.hs
index f45ee90..570ea80 100644
--- a/GHC/IO/Encoding/CodePage/API.hs
+++ b/GHC/IO/Encoding/CodePage/API.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE NoImplicitPrelude, NondecreasingIndentation, RecordWildCards, ScopedTypeVariables #-}
+{-# LANGUAGE CPP, NoImplicitPrelude, NondecreasingIndentation, RecordWildCards, ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 module GHC.IO.Encoding.CodePage.API (
     mkCodePageEncoding
diff --git a/GHC/IO/Encoding/CodePage/Table.hs b/GHC/IO/Encoding/CodePage/Table.hs
index 7e8edb9..eed0841 100644
--- a/GHC/IO/Encoding/CodePage/Table.hs
+++ b/GHC/IO/Encoding/CodePage/Table.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, MagicHash, NoImplicitPrelude #-}
+{-# LANGUAGE MagicHash, NoImplicitPrelude #-}
 -- Do not edit this file directly!
 -- It was generated by the MakeTable.hs script using the files below.
 -- To regenerate it, run "make" in ../../../../codepages/
diff --git a/GHC/Stats.hsc b/GHC/Stats.hsc
index 2c9ecaf..11e31b9 100644
--- a/GHC/Stats.hsc
+++ b/GHC/Stats.hsc
@@ -1,5 +1,4 @@
 {-# LANGUAGE Safe #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# OPTIONS_GHC -funbox-strict-fields #-}
 
diff --git a/base.cabal b/base.cabal
index f8993df..d74f472 100644
--- a/base.cabal
+++ b/base.cabal
@@ -63,7 +63,6 @@ Library
         MagicHash
         MultiParamTypeClasses
         NegativeLiterals
-        NoBangPatterns
         NoImplicitPrelude
         NondecreasingIndentation
         OverlappingInstances
diff --git a/codepages/MakeTable.hs b/codepages/MakeTable.hs
index 0a05f85..7b3328e 100644
--- a/codepages/MakeTable.hs
+++ b/codepages/MakeTable.hs
@@ -200,7 +200,7 @@ compress n ms = runState (mapM lookupOrAdd chunks) (Map.empty, Map.empty)
 -- Static parts of the generated module.
 
 languageDirectives :: [String]
-languageDirectives = ["{-# LANGUAGE CPP, MagicHash, NoImplicitPrelude #-}"]
+languageDirectives = ["{-# LANGUAGE MagicHash, NoImplicitPrelude #-}"]
 
 
 firstComment :: [FilePath] -> [String]