diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index afad0ecbf7..e582ebc2c6 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.30 1999/02/21 03:49:27 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.31 1999/03/14 16:44:01 momjian Exp $ * * NOTES * This code is actually (almost) unused. @@ -94,7 +94,7 @@ static int sec_tab[] = { * Function prototypes -- internal to this file only */ -static void reltime2tm(int32 time, struct tm * tm); +static void reltime2tm(RelativeTime time, struct tm * tm); #ifdef NOT_USED static int correct_unit(char *unit, int *unptr); @@ -161,7 +161,7 @@ reltimein(char *str) * reltimeout - converts the internal format to a reltime string */ char * -reltimeout(int32 time) +reltimeout(RelativeTime time) { char *result; struct tm tt, @@ -193,7 +193,7 @@ do { \ } while(0) static void -reltime2tm(int32 time, struct tm * tm) +reltime2tm(RelativeTime time, struct tm * tm) { TMODULO(time, tm->tm_year, 31536000); TMODULO(time, tm->tm_mon, 2592000); diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index f947dff613..9522169dcd 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.75 1999/03/14 05:09:05 momjian Exp $ + * $Id: builtins.h,v 1.76 1999/03/14 16:44:01 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -195,8 +195,8 @@ extern int32 pqtest(struct varlena * vlena); /* arrayfuncs.c */ /* date.c */ -extern int32 reltimein(char *timestring); -extern char *reltimeout(int32 timevalue); +extern RelativeTime reltimein(char *timestring); +extern char *reltimeout(RelativeTime timevalue); extern TimeInterval tintervalin(char *intervalstr); extern char *tintervalout(TimeInterval interval); extern RelativeTime timespan_reltime(TimeSpan *timespan); diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index 58a262d3aa..fca6b62877 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.h,v 1.18 1999/02/13 23:22:25 momjian Exp $ + * $Id: nabstime.h,v 1.19 1999/03/14 16:44:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,8 +23,13 @@ * * ---------------------------------------------------------------- */ -typedef int32 AbsoluteTime; -typedef int32 RelativeTime; +/* The original typedefs are bogus - they assume that the system's 'time_t' + * type is of size 32-bits. Under AlphaLinux, time_t is a long int, which + * is 64-bits. Therefore, typedef these both as simply 'time_t', and let + * the OS define what the size really is. -- RME 3/5/99 + */ +typedef time_t AbsoluteTime; +typedef time_t RelativeTime; typedef struct {