From 6dc3b6585d028dea4df3684ed975ccd2f7046e62 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Wed, 14 Oct 2015 10:05:17 -0700
Subject: More changes to avoid compiler warnings on ghc 7.10.

* CPP around deprecated `parseTime`.
* Text.Pandoc.Compat.Locale -> Text.Pandoc.Compat.Time,
  now exports Data.Time.
---
 src/Text/Pandoc/Compat/Locale.hs |  9 ---------
 src/Text/Pandoc/Compat/Time.hs   | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)
 delete mode 100644 src/Text/Pandoc/Compat/Locale.hs
 create mode 100644 src/Text/Pandoc/Compat/Time.hs

(limited to 'src/Text/Pandoc/Compat')

diff --git a/src/Text/Pandoc/Compat/Locale.hs b/src/Text/Pandoc/Compat/Locale.hs
deleted file mode 100644
index ac791136c..000000000
--- a/src/Text/Pandoc/Compat/Locale.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-{-# LANGUAGE CPP #-}
-module Text.Pandoc.Compat.Locale ( defaultTimeLocale )
-where
-
-#if MIN_VERSION_time(1,5,0)
-import Data.Time.Format ( defaultTimeLocale )
-#else
-import System.Locale ( defaultTimeLocale )
-#endif
diff --git a/src/Text/Pandoc/Compat/Time.hs b/src/Text/Pandoc/Compat/Time.hs
new file mode 100644
index 000000000..aa08ca224
--- /dev/null
+++ b/src/Text/Pandoc/Compat/Time.hs
@@ -0,0 +1,18 @@
+{-# LANGUAGE CPP #-}
+#if MIN_VERSION_time(1,5,0)
+module Text.Pandoc.Compat.Time (
+  module Data.Time
+)
+where
+import Data.Time
+
+#else
+module Text.Pandoc.Compat.Time (
+  module Data.Time,
+  defaultTimeLocale
+)
+where
+import Data.Time
+import System.Locale ( defaultTimeLocale )
+
+#endif
-- 
cgit v1.2.3