summaryrefslogtreecommitdiff
path: root/Annex/Journal.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/Journal.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/Journal.hs')
-rw-r--r--Annex/Journal.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Journal.hs b/Annex/Journal.hs
index 0f0803aaa..506cbfcaf 100644
--- a/Annex/Journal.hs
+++ b/Annex/Journal.hs
@@ -87,7 +87,7 @@ lockJournal a = do
bracketIO (lock lockfile mode) unlock (const a)
where
lock lockfile mode = do
-#ifndef __WINDOWS__
+#ifndef mingw32_HOST_OS
l <- noUmask mode $ createFile lockfile mode
waitToSetLock l (WriteLock, AbsoluteSeek, 0, 0)
return l
@@ -95,7 +95,7 @@ lockJournal a = do
writeFile lockfile ""
return lockfile
#endif
-#ifndef __WINDOWS__
+#ifndef mingw32_HOST_OS
unlock = closeFd
#else
unlock = removeFile