diff options
| author | jao <jao@gnu.org> | 2017-04-29 03:41:05 +0200 |
|---|---|---|
| committer | jao <jao@gnu.org> | 2017-04-29 03:41:05 +0200 |
| commit | 308bd1b83e07d2418ee512ee1fcaeda609907669 (patch) | |
| tree | 282dc0f4b4a1ad9b9ece17c36784df25901c7b4c | |
| parent | 2939cee44cf2ab18e2627754d19bcd8b6c9e96fb (diff) | |
| download | xmobar-308bd1b83e07d2418ee512ee1fcaeda609907669.tar.gz xmobar-308bd1b83e07d2418ee512ee1fcaeda609907669.tar.bz2 | |
CPP for GHC 8.0
| -rw-r--r-- | src/Plugins/Monitors/CoreCommon.hs | 6 | ||||
| -rw-r--r-- | xmobar.cabal | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/Plugins/Monitors/CoreCommon.hs b/src/Plugins/Monitors/CoreCommon.hs index 4ded88a..5b6d89a 100644 --- a/src/Plugins/Monitors/CoreCommon.hs +++ b/src/Plugins/Monitors/CoreCommon.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE PatternGuards #-} +{-# LANGUAGE CPP, PatternGuards #-} ----------------------------------------------------------------------------- -- | @@ -16,6 +16,10 @@ module Plugins.Monitors.CoreCommon where +#ifndef GHC8 +import Control.Applicative +#endif + import Data.Char hiding (Space) import Data.Function import Data.List diff --git a/xmobar.cabal b/xmobar.cabal index af158f6..2bf79b9 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -148,6 +148,9 @@ executable xmobar if impl (ghc < 7) cpp-options: -DGHC6 + if impl (ghc > 7) + cpp-options: -DGHC8 + if flag(with_xft) || flag(all_extensions) build-depends: utf8-string >= 0.3 && < 1.1, X11-xft >= 0.2 && < 0.4 other-modules: MinXft |