diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index f5d238bda73c8d138a5c6ecd66d68771d09c9ef5..e6ad6fc3e295da920bc604453ae4869cd6f04d5c 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -1,4 +1,4 @@ -/* +/*------------------------------------------------------------------------- * nabstime.c * Utilities for the built-in type "AbsoluteTime". * Functions for the built-in type "RelativeTime". @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.76 2000/12/03 20:45:36 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.77 2000/12/09 20:40:57 tgl Exp $ * * NOTES * @@ -33,12 +33,6 @@ #include "utils/builtins.h" -#if 0 -static AbsoluteTime tm2abstime(struct tm * tm, int tz); - -#endif - - #define MIN_DAYNUM -24856 /* December 13, 1901 */ #define MAX_DAYNUM 24854 /* January 18, 2038 */ @@ -103,6 +97,7 @@ static int sec_tab[] = { * Function prototypes -- internal to this file only */ +static AbsoluteTime tm2abstime(struct tm * tm, int tz); static void reltime2tm(RelativeTime time, struct tm * tm); #ifdef NOT_USED @@ -115,6 +110,7 @@ static int istinterval(char *i_string, AbsoluteTime *i_start, AbsoluteTime *i_end); + /* GetCurrentAbsoluteTime() * Get the current system time. Set timezone parameters if not specified elsewhere. * Define HasTZSet to allow clients to specify the default timezone. @@ -291,8 +287,8 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char *tzn) static AbsoluteTime tm2abstime(struct tm * tm, int tz) { - int day, - sec; + int day; + AbsoluteTime sec; /* validate, before going out of range on some members */ if (tm->tm_year < 1901 || tm->tm_year > 2038