[commit: packages/time] format-widths, improve-leapseconds, master, posix-perf, tasty, wip/travis: use non-GHC-specific #ifdef test for Windows (d65e1de)

git at git.haskell.org git at git.haskell.org
Mon Feb 20 21:10:54 UTC 2017


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

On branches: format-widths,improve-leapseconds,master,posix-perf,tasty,wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/d65e1de56921e9646f42f7cfda349100d57f1bba

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

commit d65e1de56921e9646f42f7cfda349100d57f1bba
Author: Simon Marlow <simonmar at microsoft.com>
Date:   Wed Jun 7 01:18:06 2006 -0700

    use non-GHC-specific #ifdef test for Windows
    
    darcs-hash:20060607081806-760e2-001f4dfd1e83fba078f4d18274e0bda5ce8910c3


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

d65e1de56921e9646f42f7cfda349100d57f1bba
 cbits/HsTime.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index 133fd6c..7e93fe8 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -26,8 +26,7 @@ long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 		name = ptm -> tm_zone;
 		gmtoff = ptm -> tm_gmtoff;
 #else
-
-# if mingw32_HOST_OS
+# if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
 		name = dst ? _tzname[1] : _tzname[0];
 # elif HAVE_TZNAME
 		name = *tzname;



More information about the ghc-commits mailing list