no cpp needed, since my love is unconditional

1 files changed, 2 insertions, 22 deletions

diff --git a/lib/GnuPGAgent.hs b/lib/GnuPGAgent.hs
index 1e40269..d73ceed 100644
--- a/lib/GnuPGAgent.hs
+++ b/lib/GnuPGAgent.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE PatternGuards #-} {-# LANGUAGE TupleSections #-}
+{-# LANGUAGE PatternGuards #-}
+{-# LANGUAGE TupleSections #-}
 module GnuPGAgent
     ( session
     , GnuPGAgent
@@ -26,21 +26,11 @@ import System.Posix.User
 import System.Environment
 import System.IO
 import Text.Printf
-#if defined(VERSION_memory)
 import qualified Data.ByteString.Char8 as S8
 import Data.ByteArray.Encoding
-#elif defined(VERSION_dataenc)
-import qualified Codec.Binary.Base16 as Base16
-#endif
 import LengthPrefixedBE
 import qualified Data.ByteString.Lazy as L
-#if defined(VERSION_hourglass)
 import Data.Hourglass
-#else
-import Data.Time.Calendar
-import Data.Time.Clock
-import Data.Time.Clock.POSIX
-#endif
 import ProcessUtils
 import Control.Monad.Fix
 import Control.Concurrent (threadDelay)
@@ -166,18 +156,12 @@ getPassphrase agent ask (Query key uid masterkey) = do
         "OK" | not (null $ drop 3 r0) -> return r0 >>= unhex . drop 3 -- . (\x -> trace (show x) x)
              | otherwise              -> hGetLine (agentHandle agent) >>= unhex . drop 3 -- . (\x -> trace (show x) x)
             where
-#if defined(VERSION_memory)
                 unhex hx = case convertFromBase Base16 (S8.pack hx) of
                             Left e -> do
                                 -- Useful for debugging but insecure generally ;)
                                 -- putStrLn $ "convertFromBase error for input "++show hx++": "++show e
                                 return Nothing
                             Right bs -> return $ Just $ S8.unpack bs
-#elif defined(VERSION_dataenc)
-                unhex hx = maybe (return () {- putStrLn $ "dataenc error for input "++show hx -})
-                                 return
-                                 $ fmap (map $ chr . fromIntegral) $ Base16.decode hx
-#endif
         "ERR" -> return Nothing
 
 quit :: GnuPGAgent -> IO ()
@@ -232,12 +216,8 @@ envhomedir opt home = do
 timeString :: Word32 -> String
 timeString t = printf "%d-%d-%d" year month day
  where
-#if defined(VERSION_hourglass)
     Date year m day = timeFromElapsed (Elapsed (Seconds $ fromIntegral t))
     month = fromEnum m + 1
-#else
-    (year,month,day) = toGregorian . utctDay $ posixSecondsToUTCTime (realToFrac t)
-#endif
 
 key_nbits :: Packet -> Int
 key_nbits p@(SecretKeyPacket {}) = _key_nbits (key_algorithm p) (key p)