From 749beb58995116dcc305baad95458362d75d360a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 26 May 2013 18:14:03 -0400
Subject: [PATCH] fix Android build, broken for 2 days

---
 Limit.hs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Limit.hs b/Limit.hs
index 944603d67a..5f477b59e8 100644
--- a/Limit.hs
+++ b/Limit.hs
@@ -13,12 +13,6 @@ import Data.Time.Clock.POSIX
 import qualified Data.Set as S
 import qualified Data.Map as M
 import System.Path.WildMatch
-#ifdef WITH_TDFA
-import Text.Regex.TDFA
-import Text.Regex.TDFA.String
-#else
-import System.Path.WildMatch
-#endif
 import System.PosixCompat.Files
 
 import Common.Annex
@@ -37,6 +31,14 @@ import Logs.Group
 import Utility.HumanTime
 import Utility.DataUnits
 
+#ifdef WITH_TDFA
+import Text.Regex.TDFA
+import Text.Regex.TDFA.String
+#else
+import System.Path.WildMatch
+import Types.FileMatcher
+#endif
+
 type MatchFiles = AssumeNotPresent -> FileInfo -> Annex Bool
 type MkLimit = String -> Either String MatchFiles
 type AssumeNotPresent = S.Set UUID
@@ -105,7 +107,7 @@ matchglob glob fi =
 	cregex = compile defaultCompOpt defaultExecOpt regex
 	regex = '^':wildToRegex glob
 #else
-	wildCheckCase glob (Annex.matchFile fi)
+	wildCheckCase glob (matchFile fi)
 #endif
 
 {- Adds a limit to skip files not believed to be present