From 0060b3c8eb66bbcfb11e763bb33dcc08857370d2 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 18 Oct 2004 16:24:40 +0000
Subject: [PATCH] The attached patch fixes psql's win32 frontend-only build, by
using pg_strcasecmp in variables.c, and #ifdef'ing out PostmasterPid in
miscadmin.h.
Dave Page
---
src/bin/psql/variables.c | 4 ++--
src/include/miscadmin.h | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index b244a7fa1ee..2e0ac69dbd1 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/variables.c,v 1.19 2004/10/15 05:02:31 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/variables.c,v 1.20 2004/10/18 16:24:38 momjian Exp $
*/
#include "postgres_fe.h"
#include "common.h"
@@ -51,7 +51,7 @@ GetVariableBool(VariableSpace space, const char *name)
val = GetVariable(space, name);
if (val == NULL)
return false; /* not set -> assume "off" */
- if (strcasecmp(val, "off") == 0)
+ if (pg_strcasecmp(val, "off") == 0)
return false; /* accept "off" or "OFF" as true */
/*
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index c09bfe33231..14507d729b1 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -13,7 +13,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.169 2004/10/09 23:13:14 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.170 2004/10/18 16:24:40 momjian Exp $
*
* NOTES
* some of the information in this file should be moved to other files.
@@ -120,7 +120,9 @@ do { \
/*
* from utils/init/globals.c
*/
+#ifndef WIN32_CLIENT_ONLY
extern pid_t PostmasterPid;
+#endif
extern bool IsPostmasterEnvironment;
extern bool IsUnderPostmaster;
--
GitLab