Permalink
Browse files

Merge branch 'master' into io-streams

Conflicts:
	src/Snap/Internal/Test/RequestBuilder.hs
	src/Snap/Internal/Types.hs
  • Loading branch information...
2 parents bdd8192 + b9dc8ac commit 342def16915010f59fddbd0be60386f002eac78c @gregorycollins gregorycollins committed Mar 3, 2014
Showing with 4 additions and 0 deletions.
  1. +4 −0 src/Snap/Internal/Types.hs
@@ -375,8 +375,12 @@ snapTyCon = mkTyCon "Snap.Core.Snap"
#endif
{-# NOINLINE snapTyCon #-}
+#if __GLASGOW_HASKELL__ < 708
instance Typeable1 Snap where
typeOf1 _ = mkTyConApp snapTyCon []
+#else
+deriving instance Typeable Snap
+#endif
#else
deriving instance Typeable Snap

0 comments on commit 342def1

Please sign in to comment.