Commit 0060b3c8 authored by Bruce Momjian's avatar Bruce Momjian

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
parent a9a2c394
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2004, PostgreSQL Global Development Group * 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 "postgres_fe.h"
#include "common.h" #include "common.h"
...@@ -51,7 +51,7 @@ GetVariableBool(VariableSpace space, const char *name) ...@@ -51,7 +51,7 @@ GetVariableBool(VariableSpace space, const char *name)
val = GetVariable(space, name); val = GetVariable(space, name);
if (val == NULL) if (val == NULL)
return false; /* not set -> assume "off" */ 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 */ return false; /* accept "off" or "OFF" as true */
/* /*
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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 * NOTES
* some of the information in this file should be moved to other files. * some of the information in this file should be moved to other files.
...@@ -120,7 +120,9 @@ do { \ ...@@ -120,7 +120,9 @@ do { \
/* /*
* from utils/init/globals.c * from utils/init/globals.c
*/ */
#ifndef WIN32_CLIENT_ONLY
extern pid_t PostmasterPid; extern pid_t PostmasterPid;
#endif
extern bool IsPostmasterEnvironment; extern bool IsPostmasterEnvironment;
extern bool IsUnderPostmaster; extern bool IsUnderPostmaster;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment