From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 16 Oct 2020 00:37:19 +0000 (-0400)
Subject: pg_upgrade:  remove C99 compiler req. from commit 3c0471b5fd
X-Git-Tag: REL9_6_20~41
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=9dcffe69a93183bba607527279270eac486463e8;p=postgresql.git

pg_upgrade:  remove C99 compiler req. from commit 3c0471b5fd

This commit required support for inline variable definition, which is
not a requirement.

RELEASE NOTE AUTHOR:  the author of commit 3c0471b5fd
(pg_upgrade/tablespaces) was Justin Pryzby, not me.

Reported-by: Andres Freund

Discussion: https://postgr.es/m/20201016001959.h24fkywfubkv2pc5@alap3.anarazel.de

Backpatch-through: 9.5
---

diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 94fbf494959..d65505bc921 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -507,11 +507,12 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
 static void
 check_for_new_tablespace_dir(ClusterInfo *new_cluster)
 {
+	int		tblnum;
 	char	new_tablespace_dir[MAXPGPATH];
 
 	prep_status("Checking for new cluster tablespace directories");
 
-	for (int tblnum = 0; tblnum < os_info.num_old_tablespaces; tblnum++)
+	for (tblnum = 0; tblnum < os_info.num_old_tablespaces; tblnum++)
 	{
 		struct stat statbuf;