From 4c29e215782e357a81d6fbb794b47b5c3210caf5 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 2 Feb 2004 16:37:46 +0000 Subject: [PATCH] Adjustments for Win32-specific rename code, and add include file. --- src/backend/commands/user.c | 6 +++--- src/backend/postmaster/pgstat.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 33eb3c39b2f..d0e39af9c1a 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.134 2004/02/02 00:17:21 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.135 2004/02/02 16:37:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -140,7 +140,7 @@ write_group_file(Relation grel) tempname = (char *) palloc(bufsize); snprintf(tempname, bufsize, "%s.%d", filename, MyProcPid); #if defined(WIN32) || defined(CYGWIN) - filename = repalloc(filename, strlen(filename) + 1 + strlen(".new"); + filename = repalloc(filename, strlen(filename) + 1 + strlen(".new")); strcat(filename, ".new"); #endif @@ -291,7 +291,7 @@ write_user_file(Relation urel) tempname = (char *) palloc(bufsize); snprintf(tempname, bufsize, "%s.%d", filename, MyProcPid); #if defined(WIN32) || defined(CYGWIN) - filename = repalloc(filename, strlen(filename) + 1 + strlen(".new"); + filename = repalloc(filename, strlen(filename) + 1 + strlen(".new")); strcat(filename, ".new"); #endif diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 606240c86eb..9ea4cd87564 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -13,7 +13,7 @@ * * Copyright (c) 2001-2003, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.57 2004/01/28 21:02:40 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.58 2004/02/02 16:37:46 momjian Exp $ * ---------- */ #include "postgres.h" @@ -45,6 +45,7 @@ #include "storage/backendid.h" #include "storage/ipc.h" #include "storage/pg_shmem.h" +#include "tcop/tcopprot.h" #include "utils/rel.h" #include "utils/hsearch.h" #include "utils/ps_status.h"