From 155cb0eafe55ba8bb066b5ddcd8a9d63c99cf7bb Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sun, 8 Jul 2012 00:18:39 +0000 Subject: [PATCH] web: fix compilation error with -fblaze_html_0_5 flag --- hledger-web/Hledger/Web/Handlers.hs | 5 +++++ hledger-web/hledger-web.cabal | 1 + 2 files changed, 6 insertions(+) diff --git a/hledger-web/Hledger/Web/Handlers.hs b/hledger-web/Hledger/Web/Handlers.hs index ede87039f..4aeafb632 100644 --- a/hledger-web/Hledger/Web/Handlers.hs +++ b/hledger-web/Hledger/Web/Handlers.hs @@ -52,7 +52,12 @@ import Data.Time.Format import System.FilePath (takeFileName) import System.IO.Storage (putValue, getValue) import System.Locale (defaultTimeLocale) +#if BLAZE_HTML_0_5 +import Text.Blaze.Internal (preEscapedString) +import Text.Blaze.Html (toHtml) +#else import Text.Blaze (preEscapedString, toHtml) +#endif import Text.Hamlet hiding (hamlet) import Text.Printf import Yesod.Core diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 09eeca41f..8b3fa4059 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -154,6 +154,7 @@ executable hledger-web , warp , yaml if flag(blaze_html_0_5) + cpp-options: -DBLAZE_HTML_0_5 build-depends: blaze-html >= 0.5 && < 0.6 , blaze-markup >= 0.5.1 && < 0.6