summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2006-04-09 19:21:34 +0000
committerTom Lane2006-04-09 19:21:34 +0000
commit513ec43ebda097f047210a07fc2e1f4abb9dd651 (patch)
tree2951848f170c4bdbbb5cf55025659de5ac47406b
parenta81e281636ac8c927528648d9eed04e8083fcdf5 (diff)
Suppress a couple of minor compiler warnings, per Magnus.
-rw-r--r--src/backend/port/win32/sema.c5
-rw-r--r--src/timezone/localtime.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/port/win32/sema.c b/src/backend/port/win32/sema.c
index 36ab482bd4b..03e0cfd995f 100644
--- a/src/backend/port/win32/sema.c
+++ b/src/backend/port/win32/sema.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/port/win32/sema.c,v 1.12 2006/03/05 15:58:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/win32/sema.c,v 1.13 2006/04/09 19:21:34 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -134,6 +134,7 @@ semget(int semKey, int semNum, int flags)
HANDLE *sem_handles = NULL;
int *sem_counts = NULL;
int i;
+ win32_sem_set_hdr *new_set;
sec_attrs.nLength = sizeof(sec_attrs);
sec_attrs.lpSecurityDescriptor = NULL;
@@ -144,7 +145,7 @@ semget(int semKey, int semNum, int flags)
strcpy(num_part, _itoa(_getpid() * -1, cur_num, 10)); /* For shared memory,
* include the pid */
- win32_sem_set_hdr *new_set = (win32_sem_set_hdr *) ShmemInitStruct(semname, sem_set_size, &found);
+ new_set = (win32_sem_set_hdr *) ShmemInitStruct(semname, sem_set_size, &found);
if (found)
{
diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c
index 342bdc920c8..fd609aba17f 100644
--- a/src/timezone/localtime.c
+++ b/src/timezone/localtime.c
@@ -3,7 +3,7 @@
* 1996-06-05 by Arthur David Olson ([email protected]).
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/timezone/localtime.c,v 1.12 2005/10/15 02:49:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/timezone/localtime.c,v 1.13 2006/04/09 19:21:34 tgl Exp $
*/
/*
@@ -456,7 +456,7 @@ getrule(const char *strp, struct rule * rulep)
* calculate the Epoch-relative time that rule takes effect.
*/
static pg_time_t
-transtime(const pg_time_t janfirst, int year,
+transtime(pg_time_t janfirst, int year,
const struct rule * rulep, long offset)
{
int leapyear;