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

fix build failure with flags -Webapp -Quvi

Browse source
This commit is contained in:
Fraser Tweedale 2014-04-08 19:49:43 +10:00
parent b37d53856b
commit 3a7068ffe6
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Annex.hs
View file

@ -5,7 +5,7 @@
- Licensed under the GNU GPL version 3 or higher. - Licensed under the GNU GPL version 3 or higher.
-} -}
{-# LANGUAGE GeneralizedNewtypeDeriving, PackageImports #-} {-# LANGUAGE CPP, GeneralizedNewtypeDeriving, PackageImports #-}
module Annex ( module Annex (
Annex, Annex,
@ -63,7 +63,9 @@ import Types.DesktopNotify
import Types.CleanupActions import Types.CleanupActions
import qualified Data.Map as M import qualified Data.Map as M
import qualified Data.Set as S import qualified Data.Set as S
#ifdef WITH_QUVI
import Utility.Quvi (QuviVersion) import Utility.Quvi (QuviVersion)
#endif
{- git-annex's monad is a ReaderT around an AnnexState stored in a MVar. {- git-annex's monad is a ReaderT around an AnnexState stored in a MVar.
- This allows modifying the state in an exception-safe fashion. - This allows modifying the state in an exception-safe fashion.
@ -117,7 +119,9 @@ data AnnexState = AnnexState
, useragent :: Maybe String , useragent :: Maybe String
, errcounter :: Integer , errcounter :: Integer
, unusedkeys :: Maybe (S.Set Key) , unusedkeys :: Maybe (S.Set Key)
#ifdef WITH_QUVI
, quviversion :: Maybe QuviVersion , quviversion :: Maybe QuviVersion
#endif
, existinghooks :: M.Map Git.Hook.Hook Bool , existinghooks :: M.Map Git.Hook.Hook Bool
, desktopnotify :: DesktopNotify , desktopnotify :: DesktopNotify
} }
@ -160,7 +164,9 @@ newState c r = AnnexState
, useragent = Nothing , useragent = Nothing
, errcounter = 0 , errcounter = 0
, unusedkeys = Nothing , unusedkeys = Nothing
#ifdef WITH_QUVI
, quviversion = Nothing , quviversion = Nothing
#endif
, existinghooks = M.empty , existinghooks = M.empty
, desktopnotify = mempty , desktopnotify = mempty
} }