> gettimeofday.c:35: warning: integer constant is too large for "long"

bmomjian · bmomjian · commit 3bce31f613d0 · 2006-03-04T04:44:07.000Z
&gt; 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
diff --git 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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* gettimeofday.c`
`3`	`3`	`* Win32 gettimeofday() replacement`
`4`	`4`	`*`
`5`		`- * $PostgreSQL: pgsql/src/port/gettimeofday.c,v 1.8 2006/03/03 23:59:14 momjian Exp $`
	`5`	`+ * $PostgreSQL: pgsql/src/port/gettimeofday.c,v 1.9 2006/03/04 04:44:07 momjian Exp $`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 2003 SRA, Inc.`
`8`	`8`	`* Copyright (c) 2003 SKC, Inc.`
`@@ -32,7 +32,7 @@`
`32`	`32`
`33`	`33`
`34`	`34`	`/* FILETIME of Jan 1 1970 00:00:00. */`
`35`		`-static const unsigned __int64 epoch = 116444736000000000LL;`
	`35`	`+static const unsigned __int64 epoch = UINT64CONST(116444736000000000);`
`36`	`36`
`37`	`37`	`/*`
`38`	`38`	`* timezone information is stored outside the kernel so tzp isn't used anymore.`