[commit: packages/time] master, wip/travis: fix deprecation of base 4.8 (7513fad)

git at git.haskell.org git at git.haskell.org
Sat May 7 06:49:32 UTC 2016


Repository : ssh://git@git.haskell.org/time

On branches: master,wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/7513fad1f1f7a4c48fa20582dfe407427484f367

>---------------------------------------------------------------

commit 7513fad1f1f7a4c48fa20582dfe407427484f367
Author: David Terei <code at davidterei.com>
Date:   Fri Nov 21 11:32:55 2014 -0800

    fix deprecation of base 4.8


>---------------------------------------------------------------

7513fad1f1f7a4c48fa20582dfe407427484f367
 lib/Data/Time/Clock/CTimeval.hs     | 4 ++++
 lib/Data/Time/LocalTime/TimeZone.hs | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/lib/Data/Time/Clock/CTimeval.hs b/lib/Data/Time/Clock/CTimeval.hs
index c8a692a..012501a 100644
--- a/lib/Data/Time/Clock/CTimeval.hs
+++ b/lib/Data/Time/Clock/CTimeval.hs
@@ -4,7 +4,11 @@ module Data.Time.Clock.CTimeval where
 #ifndef mingw32_HOST_OS
 -- All Unix-specific, this
 
+#if __GLASGOW_HASKELL__ >= 709
+import Foreign
+#else
 import Foreign.Safe
+#endif
 import Foreign.C
 
 data CTimeval = MkCTimeval CLong CLong
diff --git a/lib/Data/Time/LocalTime/TimeZone.hs b/lib/Data/Time/LocalTime/TimeZone.hs
index e9e4f5f..2efaebb 100644
--- a/lib/Data/Time/LocalTime/TimeZone.hs
+++ b/lib/Data/Time/LocalTime/TimeZone.hs
@@ -17,7 +17,11 @@ import Data.Time.Calendar.Private
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
 
+#if __GLASGOW_HASKELL__ >= 709
+import Foreign
+#else
 import Foreign.Safe
+#endif
 import Foreign.C
 import Control.DeepSeq
 import Data.Typeable



More information about the ghc-commits mailing list