diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-05 17:28:57 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-05 17:28:57 +0000 |
| commit | 69f5e41be302005475c8ac9460c2904215d9deff (patch) | |
| tree | 97d90347d3cfcb1f7f11a8619cf338ef63ce3a5c /src/backend/utils/adt/nabstime.c | |
| parent | 31cf0d6bacc3ae4103966a7ba47ed429b19364d9 (diff) | |
| download | postgresql-69f5e41be302005475c8ac9460c2904215d9deff.tar.gz postgresql-69f5e41be302005475c8ac9460c2904215d9deff.zip | |
Don't assume that struct timeval's tv_sec field is the same datatype as
time_t; on some platforms they are not the same width. Per Manfred Koizar.
Diffstat (limited to 'src/backend/utils/adt/nabstime.c')
| -rw-r--r-- | src/backend/utils/adt/nabstime.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 2e4f80cd72f..1bc96c1eb20 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.117 2003/09/29 00:05:25 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.117.2.1 2004/05/05 17:28:57 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -191,9 +191,9 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) time -= CTimeZone; if ((!HasCTZSet) && (tzp != NULL)) - tx = localtime((time_t *) &time); + tx = localtime(&time); else - tx = gmtime((time_t *) &time); + tx = gmtime(&time); tm->tm_year = tx->tm_year + 1900; tm->tm_mon = tx->tm_mon + 1; @@ -1728,10 +1728,12 @@ timeofday(PG_FUNCTION_ARGS) char buf[100]; text *result; int len; + time_t tt; gettimeofday(&tp, &tpz); + tt = (time_t) tp.tv_sec; strftime(templ, sizeof(templ), "%a %b %d %H:%M:%S.%%06d %Y %Z", - localtime((time_t *) &tp.tv_sec)); + localtime(&tt)); snprintf(buf, sizeof(buf), templ, tp.tv_usec); len = VARHDRSZ + strlen(buf); |