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.
This commit is contained in:
parent
022c3910e9
commit
93f2371e09
24 changed files with 55 additions and 55 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@ cleanupIndirect file key = do
|
|||
)
|
||||
return True
|
||||
where
|
||||
#ifdef __WINDOWS__
|
||||
#ifdef mingw32_HOST_OS
|
||||
goFast = go
|
||||
#else
|
||||
goFast = do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue