Commit0060b3c

committed

The attached patch fixes psql's win32 frontend-only build, by using

pg_strcasecmp in variables.c, and #ifdef'ing out PostmasterPid inmiscadmin.h.Dave Page

1 parenta9a2c39 commit0060b3cCopy full SHA for 0060b3c

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2004, PostgreSQL Global Development Group`
`5`	`5`	`*`
`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 $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"common.h"`
`@@ -51,7 +51,7 @@ GetVariableBool(VariableSpace space, const char *name)`
`51`	`51`	`val=GetVariable(space,name);`
`52`	`52`	`if (val==NULL)`
`53`	`53`	`return false;/* not set -> assume "off" */`
`54`		`-if (strcasecmp(val,"off")==0)`
	`54`	`+if (pg_strcasecmp(val,"off")==0)`
`55`	`55`	`return false;/* accept "off" or "OFF" as true */`
`56`	`56`
`57`	`57`	`/*`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`14`	`14`	`* Portions Copyright (c) 1994, Regents of the University of California`
`15`	`15`	`*`
`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 $`
`17`	`17`	`*`
`18`	`18`	`* NOTES`
`19`	`19`	`* some of the information in this file should be moved to other files.`
`@@ -120,7 +120,9 @@ do { \`
`120`	`120`	`/*`
`121`	`121`	`* from utils/init/globals.c`
`122`	`122`	`*/`
	`123`	`+#ifndefWIN32_CLIENT_ONLY`
`123`	`124`	`externpid_tPostmasterPid;`
	`125`	`+#endif`
`124`	`126`	`externboolIsPostmasterEnvironment;`
`125`	`127`	`externboolIsUnderPostmaster;`
`126`	`128`

Comments

(0)