slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: fix compilation error with -fblaze_html_0_5 flag

Browse Source
This commit is contained in:
Simon Michael 2012-07-08 00:18:39 +00:00
parent f8a9cce43d
commit 155cb0eafe
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hledger-web/Hledger/Web/Handlers.hs
View File

@ -52,7 +52,12 @@ import Data.Time.Format
import System.FilePath (takeFileName) import System.FilePath (takeFileName)
import System.IO.Storage (putValue, getValue) import System.IO.Storage (putValue, getValue)
import System.Locale (defaultTimeLocale) 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) import Text.Blaze (preEscapedString, toHtml)
#endif
import Text.Hamlet hiding (hamlet) import Text.Hamlet hiding (hamlet)
import Text.Printf import Text.Printf
import Yesod.Core import Yesod.Core

1
hledger-web/hledger-web.cabal
View File

@ -154,6 +154,7 @@ executable hledger-web
, warp , warp
, yaml , yaml
if flag(blaze_html_0_5) if flag(blaze_html_0_5)
cpp-options: -DBLAZE_HTML_0_5
build-depends: build-depends:
blaze-html >= 0.5 && < 0.6 blaze-html >= 0.5 && < 0.6
, blaze-markup >= 0.5.1 && < 0.6 , blaze-markup >= 0.5.1 && < 0.6