Commit 461576b9 authored by ross's avatar ross
Browse files

[project @ 2002-10-14 10:06:28 by ross]

#ifdef tweaks
parent 1d28f2f7
......@@ -48,8 +48,9 @@ module Data.Array
import Data.Dynamic
#endif
#ifdef __GLASGOW_HASKELL__
import Data.Ix
#ifdef __GLASGOW_HASKELL__
import GHC.Arr -- Most of the hard work is done here
import GHC.Err ( undefined )
#endif
......@@ -60,7 +61,6 @@ import Hugs.Array
#ifdef __NHC__
import Array -- Haskell'98 arrays
import Data.Ix
#endif
#ifndef __NHC__
......
......@@ -66,7 +66,7 @@ import Prelude
default () -- Double isn't available yet
#if !defined(__HUGS__) && !defined(__NHC__)
#ifdef __GLASGOW_HASKELL__
data (,) a b = (,) a b deriving (Eq, Ord)
data (,,) a b c = (,,) a b c deriving (Eq, Ord)
data (,,,) a b c d = (,,,) a b c d deriving (Eq, Ord)
......@@ -252,7 +252,7 @@ data (,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
data (,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,) a b c d e f g h i j k l m n o p q r s t u v w x y z a_ b_ c_ d_ e_ f_ g_ h_ i_ j_ k_ l_ m_ n_ o_ p_ q_ r_ s_ t_ u_ v_ w_ x_ y_ z_ a__ b__ c__ d__ e__ f__ g__ h__ i__ j__ k__ l__ m__ n__ o__ p__ q__ r__ s__ t__ u__ v__ w__ x__ y__ z__ a___ b___ c___ d___ e___ f___ g___ h___ i___ j___ k___ l___ m___ n___ o___ p___ q___ r___ s___ t___ u___ v___
= (,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,) a b c d e f g h i j k l m n o p q r s t u v w x y z a_ b_ c_ d_ e_ f_ g_ h_ i_ j_ k_ l_ m_ n_ o_ p_ q_ r_ s_ t_ u_ v_ w_ x_ y_ z_ a__ b__ c__ d__ e__ f__ g__ h__ i__ j__ k__ l__ m__ n__ o__ p__ q__ r__ s__ t__ u__ v__ w__ x__ y__ z__ a___ b___ c___ d___ e___ f___ g___ h___ i___ j___ k___ l___ m___ n___ o___ p___ q___ r___ s___ t___ u___ v___
-}
#endif /* neither __HUGS__ nor __NHC__ */
#endif /* __GLASGOW_HASKELL__ */
-- ---------------------------------------------------------------------------
-- Standard functions over tuples
......
......@@ -54,9 +54,7 @@ import Foreign.Storable
import Data.Bits ( Bits(..) )
import Data.Int ( Int8, Int16, Int32, Int64 )
import Data.Word ( Word8, Word16, Word32, Word64 )
#ifndef __NHC__
import Data.Dynamic
#endif
#ifdef __GLASGOW_HASKELL__
import GHC.Base
......
......@@ -85,9 +85,7 @@ instance Show (Ptr a) where
instance Show (FunPtr a) where
showsPrec p = showsPrec p . castFunPtrToPtr
#endif
#endif
#ifndef __NHC__
foreign import ccall unsafe "freeHaskellFunctionPtr"
freeHaskellFunPtr :: FunPtr a -> IO ()
#endif
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