From 989d1443a70e54d8c5f68d949d797a107ec03d86 Mon Sep 17 00:00:00 2001 From: sof Date: Sat, 15 Aug 1998 16:45:07 +0000 Subject: [PATCH] [project @ 1998-08-15 16:45:07 by sof] #undef __GLASGOW_HASKELL__ before including "rtsdefs.h" (see source code for reasons as to why we need to do this now). --- ghc/runtime/prims/PrimArith.lc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ghc/runtime/prims/PrimArith.lc b/ghc/runtime/prims/PrimArith.lc index 4cad02f..22646ef 100644 --- a/ghc/runtime/prims/PrimArith.lc +++ b/ghc/runtime/prims/PrimArith.lc @@ -7,6 +7,23 @@ \begin{code} /* basic definitions, just as if this were a module */ +/* + Sigh, ieee-flpt.h (which we need here) uses + __GLASGOW_HASKELL__ in a place or two to check + whether it is being included in a Haskell source file + or not. This is no longer the case! __GLASGOW_HASKELL__ + is also defined when compiling .c files (C code that + depend on the RTS API needs to know this). + + An unfortunate state of affairs, but since this is + the only place where the two uses of __GLASGOW_HASKELL__ + clash, we hack around and undefine it before including + the header file. -- sof 8/98 +*/ +#ifdef __GLASGOW_HASKELL__ +#undef __GLASGOW_HASKELL__ +#endif + #include "rtsdefs.h" \end{code} -- 1.7.10.4