summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-18 02:06:15 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-18 02:06:15 -0400
commit1b48e34c0e392d6619d9e18f0b2d1793f7001c48 (patch)
treea02fb90de710f5dc8bd3098be14a6ac2f94c737a
parent5aaa545a4e3419105d5f0f40d5116d8de0b16b28 (diff)
switch define used, not android specific
-rw-r--r--Utility/Yesod.hs6
-rw-r--r--git-annex.cabal2
2 files changed, 4 insertions, 4 deletions
diff --git a/Utility/Yesod.hs b/Utility/Yesod.hs
index 00424d191..2853b3369 100644
--- a/Utility/Yesod.hs
+++ b/Utility/Yesod.hs
@@ -13,7 +13,7 @@
module Utility.Yesod
( module Y
, liftH
-#ifndef __ANDROID__
+#ifndef __NO_TH__
, widgetFile
, hamletTemplate
#endif
@@ -28,7 +28,7 @@ import Yesod as Y
#else
import Yesod as Y hiding (Html)
#endif
-#ifndef __ANDROID__
+#ifndef __NO_TH__
import Yesod.Default.Util
import Language.Haskell.TH.Syntax (Q, Exp)
#if MIN_VERSION_yesod_default(1,1,0)
@@ -37,7 +37,7 @@ import Text.Hamlet hiding (Html)
#endif
#endif
-#ifndef __ANDROID__
+#ifndef __NO_TH__
widgetFile :: String -> Q Exp
#if ! MIN_VERSION_yesod_default(1,1,0)
widgetFile = widgetFileNoReload
diff --git a/git-annex.cabal b/git-annex.cabal
index 0cbd5f16f..74ba19cd7 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -161,7 +161,7 @@ Executable git-annex
if flag(Android)
Build-Depends: data-endian
- CPP-Options: -D__ANDROID__ -DANDROID_SPLICES
+ CPP-Options: -D__ANDROID__ -DANDROID_SPLICES -D__NO_TH__
if flag(AndroidSplice)
CPP-Options: -DANDROID_SPLICES