diff --git a/src/backend/port/win32/sema.c b/src/backend/port/win32/sema.c index 36ab482bd4ba5662b6197a4cc3a2216ddcd9b06f..03e0cfd995fe8f7353d5e4859a5b3b78a5c57a07 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 342bdc920c8496e10c75f041df89324046f91ae0..fd609aba17f419150369db1a6828bde3d1cbf26c 100644 --- a/src/timezone/localtime.c +++ b/src/timezone/localtime.c @@ -3,7 +3,7 @@ * 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov). * * 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;