diff options
Diffstat (limited to 'src/backend/utils/adt/nabstime.c')
| -rw-r--r-- | src/backend/utils/adt/nabstime.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 55642a1c096..29608aa78db 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.89 2001/10/18 19:52:03 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.90 2001/10/20 01:02:18 thomas Exp $ * * NOTES * @@ -256,7 +256,7 @@ GetCurrentAbsoluteTimeUsec(int *usec) }; return (AbsoluteTime) now; -} /* GetCurrentAbsoluteTime() */ +} /* GetCurrentAbsoluteTimeUsec() */ void @@ -344,7 +344,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) { *tzp = CTimeZone; tm->tm_gmtoff = CTimeZone; - tm->tm_isdst = -1; + tm->tm_isdst = 0; tm->tm_zone = NULL; if (tzn != NULL) *tzn = NULL; @@ -366,6 +366,10 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) } } } + else + { + tm->tm_isdst = -1; + } #elif defined(HAVE_INT_TIMEZONE) if (tzp != NULL) { @@ -376,7 +380,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) if (HasCTZSet) { *tzp = CTimeZone; - tm->tm_isdst = -1; + tm->tm_isdst = 0; if (tzn != NULL) *tzn = NULL; } @@ -397,6 +401,10 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) } } } + else + { + tm->tm_isdst = -1; + } #endif #else /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */ if (tzp != NULL) @@ -426,6 +434,10 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) } } } + else + { + tm->tm_isdst = -1; + } #endif return; |