[commit: packages/time] format-widths, ghc, improve-leapseconds, master, posix-perf, tasty, wip/travis: tzset regardless of HAVE_LOCALTIME_R (a22e848)

[git at git.haskell.org]

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

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

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

commit a22e848dde29581cecb03a6cea70a73ee6a405cf
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Jul 19 13:37:05 2014 -0700

    tzset regardless of HAVE_LOCALTIME_R
    
    Ignore-this: a03b607f40ed91382348da78649d6f62
    
    darcs-hash:20140719203705-ac6dd-dd66552eab0b730816f50cf4a30add39a633240b


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

a22e848dde29581cecb03a6cea70a73ee6a405cf
 cbits/HsTime.c | 2 +-
 time.cabal     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index cfafb27..646fac6 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -3,9 +3,9 @@
 
 long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 {
+    tzset();
 #if HAVE_LOCALTIME_R
     struct tm tmd;
-    tzset();
     struct tm* ptm = localtime_r(&t,&tmd);
 #else
     struct tm* ptm = localtime(&t);
diff --git a/time.cabal b/time.cabal
index fad816c..b02f0e3 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.4.2
+version:        1.4.2.1
 stability:      stable
 license:        BSD3
 license-file:   LICENSE