diff options
| author | Tom Lane | 2004-06-13 17:17:49 +0000 |
|---|---|---|
| committer | Tom Lane | 2004-06-13 17:17:49 +0000 |
| commit | da736b79e78af045cfe0d30fa564b876545a5f27 (patch) | |
| tree | 9a44ce9b9231e3ca95f5e8a31498bb5eb2ec0eba | |
| parent | 2e11ef8be8a33b28f33ae1b56421c2bf0683daa7 (diff) | |
Suppress compile warnings on machines where the INT64CONST() decoration
is actually needed. Backport of Oliver Elphick's recent patch.
| -rw-r--r-- | src/backend/utils/adt/date.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 6 | ||||
| -rw-r--r-- | src/interfaces/ecpg/pgtypeslib/dt_common.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index a0d00e73dc2..f1ef9412c86 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.93 2003/09/26 15:27:36 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.93.2.1 2004/06/13 17:17:48 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1111,7 +1111,7 @@ interval_time(PG_FUNCTION_ARGS) } else if (result < 0) { - days = (-result + INT64CONST(86400000000 - 1)) / INT64CONST(86400000000); + days = (-result + INT64CONST(86400000000) - 1) / INT64CONST(86400000000); result += days * INT64CONST(86400000000); } #else diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 52b212f602f..aa369cc59b2 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.118.2.2 2003/12/17 21:45:51 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.118.2.3 2004/06/13 17:17:48 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1208,7 +1208,7 @@ DecodeDateTime(char **field, int *ftype, int nf, tmask |= DTK_TIME_M; #ifdef HAVE_INT64_TIMESTAMP - dt2time((time * 86400000000), + dt2time((time * INT64CONST(86400000000)), &tm->tm_hour, &tm->tm_min, &tm->tm_sec, fsec); #else dt2time((time * 86400), @@ -1948,7 +1948,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf, tmask |= DTK_TIME_M; #ifdef HAVE_INT64_TIMESTAMP - dt2time((time * 86400000000), + dt2time((time * INT64CONST(86400000000)), &tm->tm_hour, &tm->tm_min, &tm->tm_sec, fsec); #else dt2time((time * 86400), diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c index 04aaa70ccfc..d11b3273916 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt_common.c +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c @@ -2255,7 +2255,7 @@ DecodeDateTime(char **field, int *ftype, int nf, tmask |= DTK_TIME_M; #ifdef HAVE_INT64_TIMESTAMP - dt2time((time * 86400000000), &tm->tm_hour, &tm->tm_min, &tm->tm_sec, fsec); + dt2time((time * INT64CONST(86400000000)), &tm->tm_hour, &tm->tm_min, &tm->tm_sec, fsec); #else dt2time((time * 86400), &tm->tm_hour, &tm->tm_min, &tm->tm_sec, fsec); #endif |