summaryrefslogtreecommitdiff
path: root/Annex/LockPool.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-08-02 12:27:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-08-02 12:27:32 -0400
commit250a25c8572e557772a9973542f9cfca6ac10b9b (patch)
tree7d4aaa36a7d5b6c3c5e03fb844fb844da4c037d2 /Annex/LockPool.hs
parenta39c161ab377eed381186bc57953cd59d6188108 (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/LockPool.hs')
-rw-r--r--Annex/LockPool.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/LockPool.hs b/Annex/LockPool.hs
index d8bc08485..40673bd7e 100644
--- a/Annex/LockPool.hs
+++ b/Annex/LockPool.hs
@@ -22,7 +22,7 @@ lockFile file = go =<< fromPool file
where
go (Just _) = noop -- already locked
go Nothing = do
-#ifndef __WINDOWS__
+#ifndef mingw32_HOST_OS
mode <- annexFileMode
fd <- liftIO $ noUmask mode $
openFd file ReadOnly (Just mode) defaultFileFlags
@@ -37,7 +37,7 @@ unlockFile :: FilePath -> Annex ()
unlockFile file = maybe noop go =<< fromPool file
where
go fd = do
-#ifndef __WINDOWS__
+#ifndef mingw32_HOST_OS
liftIO $ closeFd fd
#endif
changePool $ M.delete file