[project @ 2004-12-14 13:32:38 by malcolm]

[ghc-base.git] / Data / Dynamic.hs

diff --git a/Data/Dynamic.hs b/Data/Dynamic.hs
index 31c0199..f4e35cd 100644 (file)
--- a/Data/Dynamic.hs
+++ b/Data/Dynamic.hs
@@ -64,10 +64,10 @@ unsafeCoerce = unsafeCoerce#
 #ifdef __NHC__
 import NonStdUnsafeCoerce (unsafeCoerce)
 import NHC.IOExtras (IORef,newIORef,readIORef,writeIORef,unsafePerformIO)
-#else
-#include "Typeable.h"
 #endif
 
+#include "Typeable.h"
+
 -------------------------------------------------------------
 --
 --             The type Dynamic
@@ -88,9 +88,7 @@ import NHC.IOExtras (IORef,newIORef,readIORef,writeIORef,unsafePerformIO)
 data Dynamic = Dynamic TypeRep Obj
 #endif
 
-#ifndef __NHC__
 INSTANCE_TYPEABLE0(Dynamic,dynamicTc,"Dynamic")
-#endif
 
 instance Show Dynamic where
    -- the instance just prints the type representation.
@@ -143,7 +141,7 @@ fromDyn (Dynamic t v) def
 fromDynamic
        :: Typeable a
        => Dynamic      -- ^ the dynamically-typed object
-       -> Maybe a      -- ^ returns: @'Just' a@, if the dyanmically-typed
+       -> Maybe a      -- ^ returns: @'Just' a@, if the dynamically-typed
                        -- object has the correct type (and @a@ is its value), 
                        -- or 'Nothing' otherwise.
 fromDynamic (Dynamic t v) =