Commit 91a036fa authored by ian@well-typed.com's avatar ian@well-typed.com
Browse files

Remove some __HADDOCK__ CPP

I think these are all redundant, now that haddock uses the GHC API
parent 63f3bd8f
...@@ -24,7 +24,6 @@ you will screw up the layout where they are used in case expressions! ...@@ -24,7 +24,6 @@ you will screw up the layout where they are used in case expressions!
/* Global variables may not work in other Haskell implementations, /* Global variables may not work in other Haskell implementations,
* but we need them currently! so the conditional on GLASGOW won't do. */ * but we need them currently! so the conditional on GLASGOW won't do. */
#ifndef __HADDOCK__
#if defined(__GLASGOW_HASKELL__) || !defined(__GLASGOW_HASKELL__) #if defined(__GLASGOW_HASKELL__) || !defined(__GLASGOW_HASKELL__)
#define GLOBAL_VAR(name,value,ty) \ #define GLOBAL_VAR(name,value,ty) \
{-# NOINLINE name #-}; \ {-# NOINLINE name #-}; \
...@@ -36,15 +35,6 @@ name = Util.global (value); ...@@ -36,15 +35,6 @@ name = Util.global (value);
name :: IORef (ty); \ name :: IORef (ty); \
name = Util.globalM (value); name = Util.globalM (value);
#endif #endif
#else /* __HADDOCK__ */
#define GLOBAL_VAR(name,value,ty) \
name :: IORef (ty); \
name = Util.global (value);
#define GLOBAL_VAR_M(name,value,ty) \
name :: IORef (ty); \
name = Util.globalM (value);
#endif
#define ASSERT(e) if debugIsOn && not (e) then (assertPanic __FILE__ __LINE__) else #define ASSERT(e) if debugIsOn && not (e) then (assertPanic __FILE__ __LINE__) else
#define ASSERT2(e,msg) if debugIsOn && not (e) then (assertPprPanic __FILE__ __LINE__ (msg)) else #define ASSERT2(e,msg) if debugIsOn && not (e) then (assertPprPanic __FILE__ __LINE__ (msg)) else
......
...@@ -263,10 +263,8 @@ byte6 w = fromIntegral (w `shiftR` 48) ...@@ -263,10 +263,8 @@ byte6 w = fromIntegral (w `shiftR` 48)
byte7 w = fromIntegral (w `shiftR` 56) byte7 w = fromIntegral (w `shiftR` 56)
#endif #endif
#ifndef __HADDOCK__
-- entry point for direct returns for created constr itbls -- entry point for direct returns for created constr itbls
foreign import ccall "&stg_interp_constr_entry" stg_interp_constr_entry :: Ptr () foreign import ccall "&stg_interp_constr_entry" stg_interp_constr_entry :: Ptr ()
#endif
......
...@@ -207,10 +207,8 @@ cmpFS f1@(FastString u1 _ _ _) f2@(FastString u2 _ _ _) = ...@@ -207,10 +207,8 @@ cmpFS f1@(FastString u1 _ _ _) f2@(FastString u2 _ _ _) =
if u1 == u2 then EQ else if u1 == u2 then EQ else
compare (fastStringToByteString f1) (fastStringToByteString f2) compare (fastStringToByteString f1) (fastStringToByteString f2)
#ifndef __HADDOCK__
foreign import ccall unsafe "ghc_memcmp" foreign import ccall unsafe "ghc_memcmp"
memcmp :: Ptr a -> Ptr b -> Int -> IO Int memcmp :: Ptr a -> Ptr b -> Int -> IO Int
#endif
-- ----------------------------------------------------------------------------- -- -----------------------------------------------------------------------------
-- Construction -- Construction
......
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