From 38caab49370e2e05e48ff62b6eef66af5d412ad4 Mon Sep 17 00:00:00 2001 From: jao Date: Mon, 9 Mar 2015 00:49:44 +0100 Subject: Revert "Fix for GHC 7.8.4 (issue #213)" This reverts commit 1668793e69b7e7c78b7c5b4fd05a256c8ea9f0b1. --- src/Plugins/Date.hs | 5 ----- xmobar.cabal | 3 --- 2 files changed, 8 deletions(-) diff --git a/src/Plugins/Date.hs b/src/Plugins/Date.hs index 6cbef7e..a263536 100644 --- a/src/Plugins/Date.hs +++ b/src/Plugins/Date.hs @@ -16,16 +16,11 @@ -- ----------------------------------------------------------------------------- -{-# LANGUAGE CPP #-} - module Plugins.Date (Date(..)) where import Plugins -#ifdef GHC783 import System.Locale -#endif - import Control.Monad (liftM) import Data.Time diff --git a/xmobar.cabal b/xmobar.cabal index 05d19f5..f63ed3b 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -127,9 +127,6 @@ executable xmobar if impl (ghc < 7) cpp-options: -DGHC6 - if impl (ghc < 7.8.4) - cpp-options: -DGHC783 - if flag(with_xft) || flag(all_extensions) build-depends: utf8-string == 0.3.*, X11-xft >= 0.2 && < 0.4 other-modules: MinXft -- cgit v1.2.3