OSDN Git Service

Suppress a couple of minor compiler warnings, per Magnus.
authorTom Lane <tgl@sss.pgh.pa.us>
Sun, 9 Apr 2006 19:21:34 +0000 (19:21 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Sun, 9 Apr 2006 19:21:34 +0000 (19:21 +0000)
src/backend/port/win32/sema.c
src/timezone/localtime.c

index 36ab482..03e0cfd 100644 (file)
@@ -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)
        {
index 342bdc9..fd609ab 100644 (file)
@@ -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;