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/Gpg.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/Gpg.hs')
| -rw-r--r-- | Utility/Gpg.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index 33a26e272..d9969ed2f 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -29,7 +29,7 @@ gpgcmd = fromMaybe "gpg" SysConfig.gpg stdParams :: [CommandParam] -> IO [String] stdParams params = do -#ifndef __WINDOWS__ +#ifndef mingw32_HOST_OS -- Enable batch mode if GPG_AGENT_INFO is set, to avoid extraneous -- gpg output about password prompts. GPG_BATCH is set by the test -- suite for a similar reason. @@ -77,7 +77,7 @@ pipeStrict params input = do - Note that to avoid deadlock with the cleanup stage, - the reader must fully consume gpg's input before returning. -} feedRead :: [CommandParam] -> String -> (Handle -> IO ()) -> (Handle -> IO a) -> IO a -#ifndef __WINDOWS__ +#ifndef mingw32_HOST_OS feedRead params passphrase feeder reader = do -- pipe the passphrase into gpg on a fd (frompipe, topipe) <- createPipe |