diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-08-02 12:27:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-08-02 12:27:32 -0400 |
| commit | 250a25c8572e557772a9973542f9cfca6ac10b9b (patch) | |
| tree | 7d4aaa36a7d5b6c3c5e03fb844fb844da4c037d2 /Annex/Content.hs | |
| parent | a39c161ab377eed381186bc57953cd59d6188108 (diff) | |
get rid of __WINDOWS__, use mingw32_HOST_OS
The latter is harder for me to remember, but avoids build failures in code
used by the configure program.
Diffstat (limited to 'Annex/Content.hs')
| -rw-r--r-- | Annex/Content.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 96f9d78fc..2a109e3e3 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -92,14 +92,14 @@ inAnnexSafe = inAnnex' (fromMaybe False) (Just False) go where go f = liftIO $ openforlock f >>= check openforlock f = catchMaybeIO $ -#ifndef __WINDOWS__ +#ifndef mingw32_HOST_OS openFd f ReadOnly Nothing defaultFileFlags #else return () #endif check Nothing = return is_missing check (Just h) = do -#ifndef __WINDOWS__ +#ifndef mingw32_HOST_OS v <- getLock h (ReadLock, AbsoluteSeek, 0, 0) closeFd h return $ case v of @@ -116,7 +116,7 @@ inAnnexSafe = inAnnex' (fromMaybe False) (Just False) go - it. (If the content is not present, no locking is done.) -} lockContent :: Key -> Annex a -> Annex a lockContent key a = do -#ifdef __WINDOWS__ +#ifdef mingw32_HOST_OS a #else file <- calcRepo $ gitAnnexLocation key |