projects
/
ghc-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a8f3699
)
[project @ 2003-05-27 08:03:46 by stolz]
author
stolz
<unknown>
Tue, 27 May 2003 08:03:47 +0000
(08:03 +0000)
committer
stolz
<unknown>
Tue, 27 May 2003 08:03:47 +0000
(08:03 +0000)
GCC 3.3 cpp wibbles
Data/FiniteMap.hs
patch
|
blob
|
history
System/IO/Error.hs
patch
|
blob
|
history
diff --git
a/Data/FiniteMap.hs
b/Data/FiniteMap.hs
index
493cb95
..
3b1b785
100644
(file)
--- a/
Data/FiniteMap.hs
+++ b/
Data/FiniteMap.hs
@@
-787,4
+787,4
@@
instance (Ord key, Ord elt) => Ord (FiniteMap key elt) where
IF_NCG(COMMA (elt -> elt -> elt) -> FiniteMap Reg elt -> FiniteMap Reg elt -> FiniteMap Reg elt)
#-}
-#endif {- compiling for GHC -}
+#endif /* compiling for GHC */
diff --git
a/System/IO/Error.hs
b/System/IO/Error.hs
index
3253894
..
14e29fb
100644
(file)
--- a/
System/IO/Error.hs
+++ b/
System/IO/Error.hs
@@
-271,7
+271,7
@@
annotateIOError (IOError ohdl errTy _ str opath) loc hdl path =
xs `mplus` _ = xs
#endif /* __GLASGOW_HASKELL__ || __HUGS__ */
-#ifdef 0 /*__NHC__*/
+#if 0 /*__NHC__*/
annotateIOError (IOError msg file hdl code) msg' file' hdl' =
IOError (msg++'\n':msg') (file`mplus`file') (hdl`mplus`hdl') code
annotateIOError (EOFError msg hdl) msg' file' hdl' =