From 3bce31f613d0b7e1f9542b19124335c6d3464121 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 4 Mar 2006 04:44:07 +0000 Subject: [PATCH] > gettimeofday.c:35: warning: integer constant is too large for "long" > type Wouldn't it be better to use the UINT64CONST macro? I realize this file is Windows-only, but we do worry about more than one compiler on that platform. Kris Jurka --- src/include/commands/sequence.h | 8 ++------ src/port/gettimeofday.c | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index 13cbdc403f..b7244baec1 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/sequence.h,v 1.33 2005/10/02 23:50:12 tgl Exp $ + * $PostgreSQL: pgsql/src/include/commands/sequence.h,v 1.34 2006/03/04 04:44:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,11 +95,7 @@ extern void seq_desc(char *buf, uint8 xl_info, char *rec); /* Set the upper and lower bounds of a sequence */ #ifndef INT64_IS_BUSTED -#ifdef HAVE_LL_CONSTANTS -#define SEQ_MAXVALUE ((int64) 0x7FFFFFFFFFFFFFFFLL) -#else -#define SEQ_MAXVALUE ((int64) 0x7FFFFFFFFFFFFFFF) -#endif +#define SEQ_MAXVALUE INT64CONST(0x7FFFFFFFFFFFFFFF) #else /* INT64_IS_BUSTED */ #define SEQ_MAXVALUE ((int64) 0x7FFFFFFF) #endif /* INT64_IS_BUSTED */ diff --git a/src/port/gettimeofday.c b/src/port/gettimeofday.c index 60c8e480d5..8387088461 100644 --- a/src/port/gettimeofday.c +++ b/src/port/gettimeofday.c @@ -2,7 +2,7 @@ * gettimeofday.c * Win32 gettimeofday() replacement * - * $PostgreSQL: pgsql/src/port/gettimeofday.c,v 1.8 2006/03/03 23:59:14 momjian Exp $ + * $PostgreSQL: pgsql/src/port/gettimeofday.c,v 1.9 2006/03/04 04:44:07 momjian Exp $ * * Copyright (c) 2003 SRA, Inc. * Copyright (c) 2003 SKC, Inc. @@ -32,7 +32,7 @@ /* FILETIME of Jan 1 1970 00:00:00. */ -static const unsigned __int64 epoch = 116444736000000000LL; +static const unsigned __int64 epoch = UINT64CONST(116444736000000000); /* * timezone information is stored outside the kernel so tzp isn't used anymore. -- GitLab