From: Ian Lynagh <igloo@earth.li>
Date: Mon, 16 Jun 2008 23:07:27 +0000 (+0000)
Subject: Remove -fglasgow-exts from pragmas and comments
X-Git-Tag: 6_10_branch_has_been_forked~146
X-Git-Url: http://git.megacz.com/?p=ghc-base.git;a=commitdiff_plain;h=ec0f319384683be6603f5b2862e6621fe243dc65

Remove -fglasgow-exts from pragmas and comments
---

diff --git a/Data/Generics/Basics.hs b/Data/Generics/Basics.hs
index ac3cdde..89fe3a8 100644
--- a/Data/Generics/Basics.hs
+++ b/Data/Generics/Basics.hs
@@ -148,7 +148,7 @@ of type @r@, then the result type withing generic folding is @r -> r@.
 So the result of folding is a function to which we finally pass the
 right unit.
 
-With the @-fglasgow-exts@ option, GHC can generate instances of the
+With the @-XDeriveDataTypeable@ option, GHC can generate instances of the
 'Data' class automatically.  For example, given the declaration
 
 > data T a b = C1 a b | C2 deriving (Typeable, Data)
diff --git a/GHC/Base.lhs b/GHC/Base.lhs
index bd1b76a..622ad02 100644
--- a/GHC/Base.lhs
+++ b/GHC/Base.lhs
@@ -530,8 +530,8 @@ The Unit type is here because virtually any program needs it (whereas
 some programs may get away without consulting GHC.Tup).  Furthermore,
 the renamer currently *always* asks for () to be in scope, so that
 ccalls can use () as their default type; so when compiling GHC.Base we
-need ().  (We could arrange suck in () only if -fglasgow-exts, but putting
-it here seems more direct.)
+need ().  (We could arrange suck in () only if -XForeignFunctionInterface,
+but putting it here seems more direct.)
 
 \begin{code}
 -- | The unit datatype @()@ has one non-undefined member, the nullary
diff --git a/System/Timeout.hs b/System/Timeout.hs
index dbf9209..ce487b5 100644
--- a/System/Timeout.hs
+++ b/System/Timeout.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS -fglasgow-exts #-}
 -------------------------------------------------------------------------------
 -- |
 -- Module      :  System.Timeout
diff --git a/Text/ParserCombinators/ReadP.hs b/Text/ParserCombinators/ReadP.hs
index b2414f7..187a796 100644
--- a/Text/ParserCombinators/ReadP.hs
+++ b/Text/ParserCombinators/ReadP.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -XNoImplicitPrelude #-}
+{-# OPTIONS_GHC -XNoImplicitPrelude #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.ParserCombinators.ReadP