Merge pull request #427 from dmjio/mklink-fixes

Add CPP for new MkLink
dmjio · Jul 5, 2018 · 62a82e2 · 62a82e2
2 parents 9428e28 + 2c42a78
commit 62a82e2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/ghc-src/Miso/Html/Internal.hs b/ghc-src/Miso/Html/Internal.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE DeriveFunctor        #-}
 {-# LANGUAGE KindSignatures       #-}
 {-# LANGUAGE DataKinds            #-}
@@ -123,8 +124,14 @@ newtype View action = View { runView :: VTree action }
 
 -- | For constructing type-safe links
 instance HasLink (View a) where
+#if MIN_VERSION_servant(0,14,0)
+  type MkLink (View a) b = MkLink (Get '[] ()) b
+  toLink Proxy toA = toLink toA (Proxy :: Proxy (Get '[] ()))
+#else
   type MkLink (View a) = MkLink (Get '[] ())
-  toLink _ = toLink (Proxy :: Proxy (Get '[] ()))
+  toLink Proxy = toLink (Proxy :: Proxy (Get '[] ()))
+#endif
+
 
 -- | Convenience class for using View
 class ToView v where toView :: v -> View action

diff --git a/ghcjs-src/Miso/Html/Internal.hs b/ghcjs-src/Miso/Html/Internal.hs
@@ -90,8 +90,13 @@ newtype View action = View {
 
 -- | For constructing type-safe links
 instance HasLink (View a) where
+#if MIN_VERSION_servant(0,14,0)
+  type MkLink (View a) b = MkLink (Get '[] ()) b
+  toLink toA Proxy = toLink toA (Proxy :: Proxy (Get '[] ()))
+#else
   type MkLink (View a) = MkLink (Get '[] ())
   toLink _ = toLink (Proxy :: Proxy (Get '[] ()))
+#endif
 
 -- | Convenience class for using View
 class ToView v where toView :: v -> View m