mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

switch define used, not android specific

Browse source
This commit is contained in:
Joey Hess 2013-12-18 02:06:15 -04:00
parent 00052f4c84
commit a168b8de12
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Utility/Yesod.hs
View file

@ -13,7 +13,7 @@
module Utility.Yesod module Utility.Yesod
( module Y ( module Y
, liftH , liftH
#ifndef __ANDROID__ #ifndef __NO_TH__
, widgetFile , widgetFile
, hamletTemplate , hamletTemplate
#endif #endif
@ -28,7 +28,7 @@ import Yesod as Y
#else #else
import Yesod as Y hiding (Html) import Yesod as Y hiding (Html)
#endif #endif
#ifndef __ANDROID__ #ifndef __NO_TH__
import Yesod.Default.Util import Yesod.Default.Util
import Language.Haskell.TH.Syntax (Q, Exp) import Language.Haskell.TH.Syntax (Q, Exp)
#if MIN_VERSION_yesod_default(1,1,0) #if MIN_VERSION_yesod_default(1,1,0)
@ -37,7 +37,7 @@ import Text.Hamlet hiding (Html)
#endif #endif
#endif #endif
#ifndef __ANDROID__ #ifndef __NO_TH__
widgetFile :: String -> Q Exp widgetFile :: String -> Q Exp
#if ! MIN_VERSION_yesod_default(1,1,0) #if ! MIN_VERSION_yesod_default(1,1,0)
widgetFile = widgetFileNoReload widgetFile = widgetFileNoReload

2
git-annex.cabal
View file

@ -161,7 +161,7 @@ Executable git-annex
if flag(Android) if flag(Android)
Build-Depends: data-endian Build-Depends: data-endian
CPP-Options: -D__ANDROID__ -DANDROID_SPLICES CPP-Options: -D__ANDROID__ -DANDROID_SPLICES -D__NO_TH__
if flag(AndroidSplice) if flag(AndroidSplice)
CPP-Options: -DANDROID_SPLICES CPP-Options: -DANDROID_SPLICES