diff options
Diffstat (limited to 'crypto/heimdal/lib/roken/tm2time.c')
| -rw-r--r-- | crypto/heimdal/lib/roken/tm2time.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crypto/heimdal/lib/roken/tm2time.c b/crypto/heimdal/lib/roken/tm2time.c index b912e32..7bcba83 100644 --- a/crypto/heimdal/lib/roken/tm2time.c +++ b/crypto/heimdal/lib/roken/tm2time.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1995, 1996, 1997, 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> -RCSID("$Id: tm2time.c,v 1.7 1999/12/02 16:58:53 joda Exp $"); +RCSID("$Id: tm2time.c 14773 2005-04-12 11:29:18Z lha $"); #endif #ifdef TIME_WITH_SYS_TIME @@ -46,16 +46,16 @@ RCSID("$Id: tm2time.c,v 1.7 1999/12/02 16:58:53 joda Exp $"); #endif #include "roken.h" -time_t +time_t ROKEN_LIB_FUNCTION tm2time (struct tm tm, int local) { - time_t t; + time_t t; - tm.tm_isdst = -1; + tm.tm_isdst = local ? -1 : 0; - t = mktime (&tm); + t = mktime (&tm); - if (!local) - t += t - mktime (gmtime (&t)); - return t; + if (!local) + t += t - mktime (gmtime (&t)); + return t; } |
