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 /Utility/UserInfo.hs | |
| 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 'Utility/UserInfo.hs')
| -rw-r--r-- | Utility/UserInfo.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utility/UserInfo.hs b/Utility/UserInfo.hs index 3a71c6baf..9c3bfd42f 100644 --- a/Utility/UserInfo.hs +++ b/Utility/UserInfo.hs @@ -24,7 +24,7 @@ import Utility.Env myHomeDir :: IO FilePath myHomeDir = myVal env homeDirectory where -#ifndef __WINDOWS__ +#ifndef mingw32_HOST_OS env = ["HOME"] #else env = ["USERPROFILE", "HOME"] -- HOME is used in Cygwin @@ -34,7 +34,7 @@ myHomeDir = myVal env homeDirectory myUserName :: IO String myUserName = myVal env userName where -#ifndef __WINDOWS__ +#ifndef mingw32_HOST_OS env = ["USER", "LOGNAME"] #else env = ["USERNAME", "USER", "LOGNAME"] |