Commit 28879d9b authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Remove __HASKELL1__, __HASKELL98__, __CONCURRENT_HASKELL__

We used to define these CPP symbols, but nothing on hackage uses them
and the first 2 are no longer correct (as we support multiple Haskell
versions).
parent e1ac5b65
......@@ -1866,17 +1866,10 @@ doCpp dflags raw include_cc_opts input_fn output_fn = do
, SysTools.FileOption "" output_fn
])
cHaskell1Version :: String
cHaskell1Version = "5" -- i.e., Haskell 98
hsSourceCppOpts :: [String]
-- Default CPP defines in Haskell source
hsSourceCppOpts =
[ "-D__HASKELL1__="++cHaskell1Version
, "-D__GLASGOW_HASKELL__="++cProjectVersionInt
, "-D__HASKELL98__"
, "-D__CONCURRENT_HASKELL__"
]
[ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ]
-- -----------------------------------------------------------------------------
......
......@@ -357,44 +357,6 @@ $ cat foo.hspp</screen>
actually used).</para>
<variablelist>
<varlistentry>
<term>
<constant>&lowbar;&lowbar;HASKELL98&lowbar;&lowbar;</constant>
<indexterm><primary><literal>&lowbar;&lowbar;HASKELL98&lowbar;&lowbar;</literal></primary></indexterm>
</term>
<listitem>
<para>If defined, this means that GHC supports the
language defined by the Haskell 98 report.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<constant>&lowbar;&lowbar;HASKELL&lowbar;&lowbar;=98</constant>
<indexterm><primary><constant>&lowbar;&lowbar;HASKELL&lowbar;&lowbar;=98</constant></primary></indexterm>
</term>
<listitem>
<para>In GHC 4.04 and later, the
<constant>&lowbar;&lowbar;HASKELL&lowbar;&lowbar;</constant>
macro is defined as having the value
<constant>98</constant>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<constant>&lowbar;&lowbar;HASKELL1&lowbar;&lowbar;</constant>
<indexterm><primary><constant>&lowbar;&lowbar;HASKELL1&lowbar;&lowbar;</constant></primary></indexterm>
</term>
<listitem>
<para>If defined to <replaceable>n</replaceable>, that
means GHC supports the Haskell language defined in the
Haskell report version <emphasis>1.n</emphasis>.
Currently 5. This macro is deprecated, and will probably
disappear in future versions.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<constant>&lowbar;&lowbar;GLASGOW&lowbar;HASKELL&lowbar;&lowbar;</constant>
......@@ -434,19 +396,6 @@ $ cat foo.hspp</screen>
</listitem>
</varlistentry>
<varlistentry>
<term>
<constant>&lowbar;&lowbar;CONCURRENT&lowbar;HASKELL&lowbar;&lowbar;</constant>
<indexterm><primary><constant>&lowbar;&lowbar;CONCURRENT&lowbar;HASKELL&lowbar;&lowbar;</constant></primary></indexterm>
</term>
<listitem>
<para>This symbol is defined when pre-processing Haskell
(input) and pre-processing C (GHC output). Since GHC from
version 4.00 now supports concurrent haskell by default,
this symbol is always defined.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<constant>&lowbar;&lowbar;PARALLEL&lowbar;HASKELL&lowbar;&lowbar;</constant>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment