atzedijkstra · Jun 15, 2012 · Jun 15, 2012 · Jun 15, 2012
diff --git a/EHC/ehclib/array/Data/Array.hs b/EHC/ehclib/array/Data/Array.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
 
 -----------------------------------------------------------------------------
 -- |

diff --git a/EHC/ehclib/base/Control/Category.hs b/EHC/ehclib/base/Control/Category.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Category

diff --git a/EHC/ehclib/base/Control/Monad/Fix.hs b/EHC/ehclib/base/Control/Monad/Fix.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad.Fix

diff --git a/EHC/ehclib/base/Control/Monad/ST/Lazy.hs b/EHC/ehclib/base/Control/Monad/ST/Lazy.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad.ST.Lazy

diff --git a/EHC/ehclib/base/Data/Complex.hs b/EHC/ehclib/base/Data/Complex.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Complex

diff --git a/EHC/ehclib/base/Data/Dynamic.hs b/EHC/ehclib/base/Data/Dynamic.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Dynamic

diff --git a/EHC/ehclib/base/Data/Foldable.hs b/EHC/ehclib/base/Data/Foldable.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Foldable

diff --git a/EHC/ehclib/base/Data/Monoid.hs b/EHC/ehclib/base/Data/Monoid.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Monoid

diff --git a/EHC/ehclib/base/Data/Ratio.hs b/EHC/ehclib/base/Data/Ratio.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Ratio

diff --git a/EHC/ehclib/base/Data/Traversable.hs b/EHC/ehclib/base/Data/Traversable.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Traversable

diff --git a/EHC/ehclib/base/Numeric.hs b/EHC/ehclib/base/Numeric.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Numeric

diff --git a/EHC/ehclib/base/System/Environment.hs b/EHC/ehclib/base/System/Environment.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
 
 -----------------------------------------------------------------------------
 -- |

diff --git a/EHC/ehclib/base/Text/ParserCombinators/ReadP.hs b/EHC/ehclib/base/Text/ParserCombinators/ReadP.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude, CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.ParserCombinators.ReadP

diff --git a/EHC/ehclib/base/Text/ParserCombinators/ReadPrec.hs b/EHC/ehclib/base/Text/ParserCombinators/ReadPrec.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude, CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.ParserCombinators.ReadPrec

diff --git a/EHC/ehclib/base/Text/Read.hs b/EHC/ehclib/base/Text/Read.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude, CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.Read

diff --git a/EHC/ehclib/base/Text/Read/Lex.hs b/EHC/ehclib/base/Text/Read/Lex.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude, CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.Read.Lex

diff --git a/EHC/ehclib/base/Text/Show.hs b/EHC/ehclib/base/Text/Show.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude, CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.Show

diff --git a/EHC/ehclib/base/Text/Show/Functions.hs b/EHC/ehclib/base/Text/Show/Functions.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-orphans, CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.Show.Functions

diff --git a/EHC/ehclib/directory/System/Directory.hs b/EHC/ehclib/directory/System/Directory.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -w #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -- XXX We get some warnings on Windows
 
 -----------------------------------------------------------------------------

diff --git a/EHC/ehclib/filepath/System/FilePath.hs b/EHC/ehclib/filepath/System/FilePath.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
 
 {- |
 Module      :  System.FilePath

diff --git a/EHC/ehclib/filepath/System/FilePath/Internal.hs b/EHC/ehclib/filepath/System/FilePath/Internal.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 --
 -- Some short examples:
 --

diff --git a/EHC/ehclib/filepath/System/FilePath/Posix.hs b/EHC/ehclib/filepath/System/FilePath/Posix.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
 
 #define MODULE_NAME     Posix
 

diff --git a/EHC/ehclib/filepath/System/FilePath/Windows.hs b/EHC/ehclib/filepath/System/FilePath/Windows.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 #define MODULE_NAME     Windows
 
 #ifndef IS_WINDOWS

diff --git a/EHC/ehclib/old-time/System/Time.hsc b/EHC/ehclib/old-time/System/Time.hsc
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-unused-binds #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -- XXX with some combinations of #defines we get warnings, e.g.
 -- Warning: Defined but not used: `throwAwayReturnPointer'
 

diff --git a/EHC/ehclib/random/System/Random.hs b/EHC/ehclib/random/System/Random.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Random

diff --git a/EHC/ehclib/uhcbase/Control/Monad.hs b/EHC/ehclib/uhcbase/Control/Monad.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad

diff --git a/EHC/ehclib/uhcbase/Data/Bits.hs b/EHC/ehclib/uhcbase/Data/Bits.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Bits

diff --git a/EHC/ehclib/uhcbase/Data/Char.hs b/EHC/ehclib/uhcbase/Data/Char.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Char

diff --git a/EHC/ehclib/uhcbase/Data/Either.hs b/EHC/ehclib/uhcbase/Data/Either.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Either

diff --git a/EHC/ehclib/uhcbase/Data/IORef.hs b/EHC/ehclib/uhcbase/Data/IORef.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.IORef

diff --git a/EHC/ehclib/uhcbase/Data/List.hs b/EHC/ehclib/uhcbase/Data/List.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.List

diff --git a/EHC/ehclib/uhcbase/Data/Maybe.hs b/EHC/ehclib/uhcbase/Data/Maybe.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Maybe

diff --git a/EHC/ehclib/uhcbase/Data/Typeable.hs b/EHC/ehclib/uhcbase/Data/Typeable.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude -XOverlappingInstances -funbox-strict-fields #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
 
 -- The -XOverlappingInstances flag allows the user to over-ride
 -- the instances for Typeable given here.  In particular, we provide an instance

diff --git a/EHC/ehclib/uhcbase/Data/Word.hs b/EHC/ehclib/uhcbase/Data/Word.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Word

diff --git a/EHC/ehclib/uhcbase/Debug/Trace.hs b/EHC/ehclib/uhcbase/Debug/Trace.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Debug.Trace

diff --git a/EHC/ehclib/uhcbase/Foreign.hs b/EHC/ehclib/uhcbase/Foreign.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign

diff --git a/EHC/ehclib/uhcbase/Foreign/C/Error.hs b/EHC/ehclib/uhcbase/Foreign/C/Error.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude -#include "HsBase.h" #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.C.Error

diff --git a/EHC/ehclib/uhcbase/Foreign/C/String.hs b/EHC/ehclib/uhcbase/Foreign/C/String.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.C.String

diff --git a/EHC/ehclib/uhcbase/Foreign/C/Types.hs b/EHC/ehclib/uhcbase/Foreign/C/Types.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# OPTIONS_GHC -fno-warn-unused-binds #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
 {-# EXCLUDE_IF_TARGET js #-}
 -- XXX -fno-warn-unused-binds stops us warning about unused constructors,
 -- but really we should just remove them if we don't want them

diff --git a/EHC/ehclib/uhcbase/Foreign/ForeignPtr.hs b/EHC/ehclib/uhcbase/Foreign/ForeignPtr.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.ForeignPtr

diff --git a/EHC/ehclib/uhcbase/Foreign/Marshal/Alloc.hs b/EHC/ehclib/uhcbase/Foreign/Marshal/Alloc.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.Marshal.Alloc

diff --git a/EHC/ehclib/uhcbase/Foreign/Marshal/Array.hs b/EHC/ehclib/uhcbase/Foreign/Marshal/Array.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.Marshal.Array

diff --git a/EHC/ehclib/uhcbase/Foreign/Marshal/Error.hs b/EHC/ehclib/uhcbase/Foreign/Marshal/Error.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.Marshal.Error

diff --git a/EHC/ehclib/uhcbase/Foreign/Marshal/Pool.hs b/EHC/ehclib/uhcbase/Foreign/Marshal/Pool.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 --------------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.Marshal.Pool

diff --git a/EHC/ehclib/uhcbase/Foreign/Marshal/Utils.hs b/EHC/ehclib/uhcbase/Foreign/Marshal/Utils.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.Marshal.Utils

diff --git a/EHC/ehclib/uhcbase/Foreign/Ptr.hs b/EHC/ehclib/uhcbase/Foreign/Ptr.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.Ptr

diff --git a/EHC/ehclib/uhcbase/Foreign/StablePtr.hs b/EHC/ehclib/uhcbase/Foreign/StablePtr.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.StablePtr

diff --git a/EHC/ehclib/uhcbase/Foreign/Storable.hs b/EHC/ehclib/uhcbase/Foreign/Storable.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Foreign.Storable

diff --git a/EHC/ehclib/uhcbase/System/IO.hs b/EHC/ehclib/uhcbase/System/IO.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude -#include "HsBase.h" #-}
 {-# EXCLUDE_IF_TARGET js #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.IO

diff --git a/EHC/ehclib/uhcbase/System/IO/Error.hs b/EHC/ehclib/uhcbase/System/IO/Error.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
 
 -----------------------------------------------------------------------------
 -- |

diff --git a/EHC/ehclib/uhcbase/System/IO/Unsafe.hs b/EHC/ehclib/uhcbase/System/IO/Unsafe.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude, CPP #-}
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# OPTIONS_UHC "--optP=-traditional-cpp" #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.IO.Unsafe