[project @ 2005-03-09 10:36:38 by simonmar]

revert previous change, it didn't work

diff --git a/ghc/compiler/iface/BinIface.hs b/ghc/compiler/iface/BinIface.hs
index 402ba1f..b809e3a 100644 (file)
--- a/ghc/compiler/iface/BinIface.hs
+++ b/ghc/compiler/iface/BinIface.hs
@@ -8,7 +8,6 @@
 module BinIface ( writeBinIface, readBinIface, v_IgnoreHiWay ) where
 
 #include "HsVersions.h"
-#include "MachDeps.h"
 
 import HscTypes
 import BasicTypes
@@ -26,11 +25,12 @@ import Binary
 import Util
 
 import DATA_IOREF
-import DATA_WORD       ( Word8 )
 import EXCEPTION       ( throwDyn )
 import Monad           ( when )
 import Outputable
 
+#include "HsVersions.h"
+
 -- ---------------------------------------------------------------------------
 writeBinIface :: FilePath -> ModIface -> IO ()
 writeBinIface hi_path mod_iface
@@ -111,7 +111,6 @@ instance Binary ModIface where
        put_ bh (show opt_HiVersion)
        build_tag <- readIORef v_Build_tag
        put  bh build_tag
-        put_ bh (WORD_SIZE_IN_BITS :: Word8)
        put_ bh mod
        put_ bh is_boot
        put_ bh mod_vers
@@ -147,15 +146,6 @@ instance Binary ModIface where
                "mismatched interface file ways: expected "
                ++ build_tag ++ ", found " ++ check_way))
 
-       check_ws <- get bh
-       let our_ws = WORD_SIZE_IN_BITS :: Word8
-        when (check_ws /= our_ws) $
-          -- use userError because this will be caught by readIface
-          -- which will emit an error msg containing the iface module name.
-          throwDyn (ProgramError (
-               "mismatched word size: expected "
-               ++ show our_ws ++ ", found " ++ show check_ws))
-
        mod_name  <- get bh
        is_boot   <- get bh
        mod_vers  <- get bh