summaryrefslogtreecommitdiff
path: root/Git/Construct.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 /Git/Construct.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 'Git/Construct.hs')
-rw-r--r--Git/Construct.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Git/Construct.hs b/Git/Construct.hs
index 6f58e9b28..586fa8c03 100644
--- a/Git/Construct.hs
+++ b/Git/Construct.hs
@@ -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