Remove more ifdeffery

compiler/ghci/Linker.lhs

@@ -230,13 +230,12 @@ dataConInfoPtrToName x = do
    -}
 
    getConDescAddress :: Ptr StgInfoTable -> IO (Ptr Word8)
-   getConDescAddress ptr = do
-#ifdef GHCI_TABLES_NEXT_TO_CODE
+   getConDescAddress ptr
+    | ghciTablesNextToCode = do
        offsetToString <- peek $ ptr `plusPtr` (- wORD_SIZE)
        return $ (ptr `plusPtr` stdInfoTableSizeB) `plusPtr` (fromIntegral (offsetToString :: StgWord))
-#else
+    | otherwise =
        peek $ intPtrToPtr $ (ptrToIntPtr ptr) + fromIntegral stdInfoTableSizeB
-#endif
 
    -- parsing names is a little bit fiddly because we have a string in the form: 
    -- pkg:A.B.C.foo, and we want to split it into three parts: ("pkg", "A.B.C", "foo").

compiler/utils/Util.lhs

@@ -6,7 +6,8 @@
 
 \begin{code}
 module Util (
-        debugIsOn, isWindowsHost, isWindowsTarget, isDarwinTarget,
+        debugIsOn, ghciTablesNextToCode,
+        isWindowsHost, isWindowsTarget, isDarwinTarget,
 
         -- general list processing
         zipEqual, zipWithEqual, zipWith3Equal, zipWith4Equal,
@@ -118,6 +119,13 @@ debugIsOn = True
 debugIsOn = False
 #endif
 
+ghciTablesNextToCode :: Bool
+#ifdef GHCI_TABLES_NEXT_TO_CODE
+ghciTablesNextToCode = True
+#else
+ghciTablesNextToCode = False
+#endif
+
 isWindowsHost :: Bool
 #ifdef mingw32_HOST_OS
 isWindowsHost = True