summaryrefslogtreecommitdiff
path: root/Utility/Gpg.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <id@joeyh.name>2013-05-10 16:57:21 -0500
committerGravatar Joey Hess <id@joeyh.name>2013-05-10 16:57:21 -0500
commitae6293ae6710b0a7580bc9a0045c92d1d5b87036 (patch)
treefbd105bed124fb698fdc5bbdf4eb2d9ccd086979 /Utility/Gpg.hs
parent5d0476bf59674b39fa6bad7e4446b5c741181143 (diff)
fixup #if 0 stubs to use #ifndef mingw32_HOST_OS
That's needed in files used to build the configure program. For the other files, I'm keeping my __WINDOWS__ define, as I find that much easier to type. I may search and replace it to use the mingw32_HOST_OS thing later.
Diffstat (limited to 'Utility/Gpg.hs')
-rwxr-xr-xUtility/Gpg.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index 6fcf173b1..0ed4b85da 100755
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -13,7 +13,7 @@ import System.Posix.Types
import Control.Applicative
import Control.Concurrent
import Control.Exception (bracket)
-#if 0
+#ifndef mingw32_HOST_OS
import System.Posix.Env (setEnv, unsetEnv, getEnv)
#endif
@@ -216,7 +216,7 @@ keyBlock public ls = unlines
| public = "PUBLIC"
| otherwise = "PRIVATE"
-#if 0
+#ifndef mingw32_HOST_OS
{- Runs an action using gpg in a test harness, in which gpg does
- not use ~/.gpg/, but a directory with the test key set up to be used. -}
testHarness :: IO a -> IO a