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 /Command | |
| 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 'Command')
| -rw-r--r-- | Command/Fsck.hs | 6 | ||||
| -rw-r--r-- | Command/Unannex.hs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs index ccc5811cc..6464fc002 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -35,7 +35,7 @@ import Utility.HumanTime import Git.FilePath import GitAnnex.Options -#ifndef __WINDOWS__ +#ifndef mingw32_HOST_OS import System.Posix.Process (getProcessID) #else import System.Random (getStdRandom, random) @@ -151,7 +151,7 @@ performRemote key file backend numcopies remote = , checkKeyNumCopies key file numcopies ] withtmp a = do -#ifndef __WINDOWS__ +#ifndef mingw32_HOST_OS v <- liftIO getProcessID #else v <- liftIO (getStdRandom random :: IO Int) @@ -458,7 +458,7 @@ recordFsckTime key = do parent <- parentDir <$> calcRepo (gitAnnexLocation key) liftIO $ void $ tryIO $ do touchFile parent -#ifndef __WINDOWS__ +#ifndef mingw32_HOST_OS setSticky parent #endif diff --git a/Command/Unannex.hs b/Command/Unannex.hs index ec00ded11..fbeaffa52 100644 --- a/Command/Unannex.hs +++ b/Command/Unannex.hs @@ -66,7 +66,7 @@ cleanupIndirect file key = do ) return True where -#ifdef __WINDOWS__ +#ifdef mingw32_HOST_OS goFast = go #else goFast = do |