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:
Joey Hess 2013-08-02 12:27:32 -04:00
parent 022c3910e9
commit 93f2371e09
24 changed files with 55 additions and 55 deletions

View file

@ -25,7 +25,7 @@ module Git.Construct (
{-# LANGUAGE CPP #-}
#ifndef __WINDOWS__
#ifndef mingw32_HOST_OS
import System.Posix.User
#else
import Git.FilePath
@ -146,7 +146,7 @@ fromRemoteLocation :: String -> Repo -> IO Repo
fromRemoteLocation s repo = gen $ calcloc s
where
gen v
#ifdef __WINDOWS__
#ifdef mingw32_HOST_OS
| dosstyle v = fromRemotePath (dospath v) repo
#endif
| scpstyle v = fromUrl $ scptourl v
@ -182,7 +182,7 @@ fromRemoteLocation s repo = gen $ calcloc s
| "/" `isPrefixOf` d = d
| "~" `isPrefixOf` d = '/':d
| otherwise = "/~/" ++ d
#ifdef __WINDOWS__
#ifdef mingw32_HOST_OS
-- git on Windows will write a path to .git/config with "drive:",
-- which is not to be confused with a "host:"
dosstyle = hasDrive
@ -208,7 +208,7 @@ repoAbsPath d = do
return $ h </> d'
expandTilde :: FilePath -> IO FilePath
#ifdef __WINDOWS__
#ifdef mingw32_HOST_OS
expandTilde = return
#else
expandTilde = expandt True

View file

@ -41,7 +41,7 @@ get = do
return $ addworktree wt r
where
pathenv s = do
#ifndef __WINDOWS__
#ifndef mingw32_HOST_OS
v <- getEnv s
case v of
Just d -> do

View file

@ -44,14 +44,14 @@ asTopFilePath file = TopFilePath file
type InternalGitPath = String
toInternalGitPath :: FilePath -> InternalGitPath
#ifndef __WINDOWS__
#ifndef mingw32_HOST_OS
toInternalGitPath = id
#else
toInternalGitPath = replace "\\" "/"
#endif
fromInternalGitPath :: InternalGitPath -> FilePath
#ifndef __WINDOWS__
#ifndef mingw32_HOST_OS
fromInternalGitPath = id
#else
fromInternalGitPath = replace "/" "\\"