diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-21 05:08:06 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-21 05:08:06 +0000 |
| commit | 63bd0db12199c5df043e1dea0f2b574f622b3a4c (patch) | |
| tree | dbafdb6e4541162ad369dbfeca24cbd62aefddcc /src/include/utils/timestamp.h | |
| parent | 260b513fc37b6ed2df51586c487d0832b89d0d70 (diff) | |
Integrate src/timezone library for all platforms. There is more we can
and should do now that we control our own destiny for timezone handling,
but this commit gets the bulk of the picayune diffs in place.
Magnus Hagander and Tom Lane.
Diffstat (limited to 'src/include/utils/timestamp.h')
| -rw-r--r-- | src/include/utils/timestamp.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index d514114ef96..32de318f946 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,19 +6,19 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.36 2004/05/01 19:25:08 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.37 2004/05/21 05:08:05 tgl Exp $ * *------------------------------------------------------------------------- */ #ifndef TIMESTAMP_H #define TIMESTAMP_H -#include <time.h> #include <math.h> #include <limits.h> #include <float.h> #include "fmgr.h" +#include "pgtime.h" #ifdef HAVE_INT64_TIMESTAMP #include "utils/int8.h" #endif @@ -251,16 +251,16 @@ extern Datum now(PG_FUNCTION_ARGS); /* Internal routines (not fmgr-callable) */ -extern int tm2timestamp(struct tm * tm, fsec_t fsec, int *tzp, Timestamp *dt); -extern int timestamp2tm(Timestamp dt, int *tzp, struct tm * tm, +extern int tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *dt); +extern int timestamp2tm(Timestamp dt, int *tzp, struct pg_tm * tm, fsec_t *fsec, char **tzn); extern void dt2time(Timestamp dt, int *hour, int *min, int *sec, fsec_t *fsec); -extern int interval2tm(Interval span, struct tm * tm, fsec_t *fsec); -extern int tm2interval(struct tm * tm, fsec_t fsec, Interval *span); +extern int interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec); +extern int tm2interval(struct pg_tm * tm, fsec_t fsec, Interval *span); extern Timestamp SetEpochTimestamp(void); -extern void GetEpochTime(struct tm * tm); +extern void GetEpochTime(struct pg_tm * tm); extern int timestamp_cmp_internal(Timestamp dt1, Timestamp dt2); /* timestamp comparison works for timestamptz also */ |