diff options
| author | Thomas G. Lockhart | 2002-01-01 02:54:33 +0000 |
|---|---|---|
| committer | Thomas G. Lockhart | 2002-01-01 02:54:33 +0000 |
| commit | c546170e7765eaff1bd2ec14fbaa8d3c2b75a7b2 (patch) | |
| tree | 8f5f22450f5775842626524f623861da6dc9a6be /src | |
| parent | 6b086de31ae459daa6fff654a176406f29948bf3 (diff) | |
Rename TIME token to ISOTIME to eliminate conflict with gram.y parser
token. Seems to be isolated to datetime.c and datetime.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 8 | ||||
| -rw-r--r-- | src/include/utils/datetime.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 49e93abe99a..83255fb1eb4 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.86 2001/12/30 23:09:41 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.87 2002/01/01 02:54:27 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -414,7 +414,7 @@ sgt #if 0 syot #endif - {"t", TIME, DTK_TIME}, /* Filler for ISO time fields */ + {"t", ISOTIME, DTK_TIME}, /* Filler for ISO time fields */ #if 0 taht #endif @@ -1353,7 +1353,7 @@ DecodeDateTime(char **field, int *ftype, int nf, ptype = val; break; - case TIME: + case ISOTIME: /* This is a filler field "t" * indicating that the next field is time. * Try to verify that this is sensible. @@ -1909,7 +1909,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf, ptype = val; break; - case TIME: + case ISOTIME: tmask = 0; /*** diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index b0100d40568..7858498a953 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: datetime.h,v 1.27 2001/12/29 18:31:48 thomas Exp $ + * $Id: datetime.h,v 1.28 2002/01/01 02:54:33 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -109,8 +109,8 @@ #define ABS_BEFORE 18 #define ABS_AFTER 19 /* generic fields to help with parsing */ -#define DATE 20 -#define TIME 21 +#define ISODATE 20 +#define ISOTIME 21 /* reserved for unrecognized string values */ #define UNKNOWN_FIELD 31 |