diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 6ca9212c8821726a1a6a8cb5e5359eeb4a3aaa8b..affe3c6a68820d255c62faf64b6dfcd3a0349324 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.126 2005/06/27 02:04:24 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.127 2005/07/25 04:52:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -234,7 +234,7 @@ pg_krb5_recvauth(Port *port)
 
 	kusername = pg_an_to_ln(kusername);
 	if (pg_krb_caseins_users)
-		ret = strncasecmp(port->user_name, kusername, SM_DATABASE_USER);
+		ret = pg_strncasecmp(port->user_name, kusername, SM_DATABASE_USER);
 	else
 		ret = strncmp(port->user_name, kusername, SM_DATABASE_USER);
 	if (ret)
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 281f247d422ac711a26c889e4aa8956a4d99a015..46cb106b1343c684aadb010170616bdb9972bedf 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.92 2005/07/10 16:13:12 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.93 2005/07/25 04:52:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -829,7 +829,7 @@ check_encodings_match(int pg_enc, const char *ctype)
 	for (i = 0; encoding_match_list[i].system_enc_name; i++)
 	{
 		if (pg_enc == encoding_match_list[i].pg_enc_code
-		 && strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)
+		 && pg_strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)
 		{
 			free(sys);
 			return;
@@ -860,7 +860,7 @@ find_matching_encoding(const char *ctype)
 
 	for (i = 0; encoding_match_list[i].system_enc_name; i++)
 	{
-		if (strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)
+		if (pg_strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)
 		{
 			free(sys);
 			return encoding_match_list[i].pg_enc_code;
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index efd325419fea37e3a725a0a1079847619a56b067..fe03b818e22d3311a80979b81a0e60e9acf1e9df 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.59 2005/07/10 16:13:13 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.60 2005/07/25 04:52:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -911,7 +911,7 @@ pgwin32_CommandLine(bool registration)
 
 	if (registration)
 	{
-		if (strcasecmp(cmdLine + strlen(cmdLine) - 4, ".exe"))
+		if (pg_strcasecmp(cmdLine + strlen(cmdLine) - 4, ".exe"))
 		{
 			/* If commandline does not end in .exe, append it */
 			strcat(cmdLine, ".exe");
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 795f45d23be6476019a811a3a7f46fd60f2739d3..498c598e2b5ffb3729da56aef2ff125a7a532b7d 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.64 2005/07/18 19:12:09 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.65 2005/07/25 04:52:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -828,8 +828,8 @@ makeAlterConfigCommand(const char *arrayitem, const char *type, const char *name
 	 * Some GUC variable names are 'LIST' type and hence must not be
 	 * quoted.
 	 */
-	if (strcasecmp(mine, "DateStyle") == 0
-		|| strcasecmp(mine, "search_path") == 0)
+	if (pg_strcasecmp(mine, "DateStyle") == 0
+		|| pg_strcasecmp(mine, "search_path") == 0)
 		appendPQExpBuffer(buf, "%s", pos + 1);
 	else
 		appendStringLiteral(buf, pos + 1, false);