From: malcolm <unknown>
Date: Wed, 18 Dec 2002 10:42:54 +0000 (+0000)
Subject: [project @ 2002-12-18 10:42:54 by malcolm]
X-Git-Tag: nhc98-1-18-release~778
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=ce67d07e26dcdf5489bf16772f7b02ff8d07eabd;p=ghc-base.git

[project @ 2002-12-18 10:42:54 by malcolm]
With nhc98, avoid overlap between Prelude defns and Control.Monad defns.
---

diff --git a/Control/Monad.hs b/Control/Monad.hs
index 013d12a..29f8f66 100644
--- a/Control/Monad.hs
+++ b/Control/Monad.hs
@@ -72,7 +72,7 @@ import GHC.List
 import GHC.Base
 #endif
 
-#ifndef __HUGS__
+#ifdef __GLASGOW_HASKELL__
 infixr 1 =<<
 
 -- -----------------------------------------------------------------------------
@@ -99,7 +99,7 @@ mapM f as       =  sequence (map f as)
 mapM_           :: Monad m => (a -> m b) -> [a] -> m ()
 {-# INLINE mapM_ #-}
 mapM_ f as      =  sequence_ (map f as)
-#endif  /* __HUGS__ */
+#endif  /* __GLASGOW_HASKELL__ */
 
 -- -----------------------------------------------------------------------------
 -- |The MonadPlus class definition