Skip to content

Commit 0060b3c

Browse files
committed
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
1 parent a9a2c39 commit 0060b3c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/bin/psql/variables.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/variables.c,v 1.19 2004/10/15 05:02:31 momjian Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/variables.c,v 1.20 2004/10/18 16:24:38 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "common.h"
@@ -51,7 +51,7 @@ GetVariableBool(VariableSpace space, const char *name)
5151
val = GetVariable(space, name);
5252
if (val == NULL)
5353
return false; /* not set -> assume "off" */
54-
if (strcasecmp(val, "off") == 0)
54+
if (pg_strcasecmp(val, "off") == 0)
5555
return false; /* accept "off" or "OFF" as true */
5656

5757
/*

src/include/miscadmin.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
1414
* Portions Copyright (c) 1994, Regents of the University of California
1515
*
16-
* $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.169 2004/10/09 23:13:14 tgl Exp $
16+
* $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.170 2004/10/18 16:24:40 momjian Exp $
1717
*
1818
* NOTES
1919
* some of the information in this file should be moved to other files.
@@ -120,7 +120,9 @@ do { \
120120
/*
121121
* from utils/init/globals.c
122122
*/
123+
#ifndef WIN32_CLIENT_ONLY
123124
extern pid_t PostmasterPid;
125+
#endif
124126
extern bool IsPostmasterEnvironment;
125127
extern bool IsUnderPostmaster;
126128

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy