From 9df96f9bb1cb8bc0350f02bbd0a113480e84224a Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 19 Oct 2010 02:55:54 +0000
Subject: [PATCH] In pg_upgrade, rename macro EXEC_EXT to SHELL_EXT for
 clarity.

Backpatch to 9.0.X.
---
 contrib/pg_upgrade/check.c      | 2 +-
 contrib/pg_upgrade/pg_upgrade.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 144fcdc8174..5b26be3605b 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -389,7 +389,7 @@ create_script_for_old_cluster_deletion(migratorContext *ctx,
 	prep_status(ctx, "Creating script to delete old cluster");
 
 	snprintf(*deletion_script_file_name, MAXPGPATH, "%s/delete_old_cluster.%s",
-			 ctx->cwd, EXEC_EXT);
+			 ctx->cwd, SHELL_EXT);
 
 	if ((script = fopen(*deletion_script_file_name, "w")) == NULL)
 		pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n",
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 73070c6259d..3f8fb0ccf9d 100644
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -39,14 +39,14 @@
 #define pg_mv_file			rename
 #define pg_link_file		link
 #define RMDIR_CMD			"rm -rf"
-#define EXEC_EXT			"sh"
+#define SHELL_EXT			"sh"
 #else
 #define pg_copy_file		CopyFile
 #define pg_mv_file			pgrename
 #define pg_link_file		win32_pghardlink
 #define sleep(x)			Sleep(x * 1000)
 #define RMDIR_CMD			"RMDIR /s/q"
-#define EXEC_EXT			"bat"
+#define SHELL_EXT			"bat"
 #define EXE_EXT				".exe"
 #endif
 
-- 
GitLab