Repository : ssh://[email protected]/time On branch : ghc-head Link : http://git.haskell.org/?p=packages/time.git;a=commit;h=74d0e758925ad5c190ae3dc84ec28e9c7df2b5a3
>--------------------------------------------------------------- commit 74d0e758925ad5c190ae3dc84ec28e9c7df2b5a3 Author: Ashley Yakeley <[email protected]> Date: Mon Jun 24 00:35:10 2013 +0000 detabify cbits >--------------------------------------------------------------- 74d0e758925ad5c190ae3dc84ec28e9c7df2b5a3 cbits/HsTime.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/cbits/HsTime.c b/cbits/HsTime.c index e8a1155..cfafb27 100644 --- a/cbits/HsTime.c +++ b/cbits/HsTime.c @@ -4,38 +4,38 @@ long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname) { #if HAVE_LOCALTIME_R - struct tm tmd; - tzset(); - struct tm* ptm = localtime_r(&t,&tmd); + struct tm tmd; + tzset(); + struct tm* ptm = localtime_r(&t,&tmd); #else - struct tm* ptm = localtime(&t); + struct tm* ptm = localtime(&t); #endif - if (ptm) - { - int dst = ptm -> tm_isdst; - *pdst = dst; + if (ptm) + { + int dst = ptm -> tm_isdst; + *pdst = dst; #if HAVE_TM_ZONE - *pname = ptm -> tm_zone; - return ptm -> tm_gmtoff; + *pname = ptm -> tm_zone; + return ptm -> tm_gmtoff; #elif defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32) - // We don't have a better API to use on Windows, the logic to - // decide whether a given date/time falls within DST is - // implemented as part of localtime() in the CRT. This is_dst - // flag is all we need here. - *pname = dst ? _tzname[1] : _tzname[0]; - return - (dst ? _timezone - 3600 : _timezone); + // We don't have a better API to use on Windows, the logic to + // decide whether a given date/time falls within DST is + // implemented as part of localtime() in the CRT. This is_dst + // flag is all we need here. + *pname = dst ? _tzname[1] : _tzname[0]; + return - (dst ? _timezone - 3600 : _timezone); #else # if HAVE_TZNAME - *pname = *tzname; + *pname = *tzname; # else # error "Don't know how to get timezone name on your OS" # endif # if HAVE_DECL_ALTZONE - return dst ? altzone : timezone; + return dst ? altzone : timezone; # else - return dst ? timezone - 3600 : timezone; + return dst ? timezone - 3600 : timezone; # endif #endif // HAVE_TM_ZONE - } - else return 0x80000000; + } + else return 0x80000000; } _______________________________________________ ghc-commits mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-commits
