[commit: packages/time] master, wip/travis: eliminate the other mingw32_HOST_OS test (0108ad0)

git at git.haskell.org git at git.haskell.org
Sat May 7 06:43:33 UTC 2016


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

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

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

commit 0108ad00f1ea1b38f448a7a3462a1745b892467c
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Wed Jun 7 01:35:28 2006 -0700

    eliminate the other mingw32_HOST_OS test
    
    darcs-hash:20060607083528-b47d3-c41fa71af0c4ab114f85816306687ee85c2860a1


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

0108ad00f1ea1b38f448a7a3462a1745b892467c
 cbits/HsTime.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index 7e93fe8..f9651e9 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -25,18 +25,18 @@ long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 #if HAVE_TM_ZONE
 		name = ptm -> tm_zone;
 		gmtoff = ptm -> tm_gmtoff;
-#else
-# if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
+#elif defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
 		name = dst ? _tzname[1] : _tzname[0];
-# elif HAVE_TZNAME
+		gmtoff = dst ? _timezone - 3600 : _timezone;
+#else
+
+# if HAVE_TZNAME
 		name = *tzname;
 # else
 #  error "Don't know how to get at timezone name on your OS"
 # endif
 
-# if mingw32_HOST_OS
-		gmtoff = dst ? _timezone - 3600 : _timezone;
-# elif HAVE_DECL_ALTZONE
+# if HAVE_DECL_ALTZONE
 		gmtoff = dst ? altzone : timezone;
 # else
 		gmtoff = dst ? timezone - 3600 : timezone;



More information about the ghc-commits mailing list