git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 377e6e9)
In pg_upgrade, rename macro EXEC_EXT to SHELL_EXT for clarity.
2010年10月19日 02:55:58 +0000 (02:55 +0000)
2010年10月19日 02:55:58 +0000 (02:55 +0000)
Backpatch to 9.0.X.


diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 654a1a38666b15ae71b5716ecf95f4cb52155c2e..fb35507af103b11140044098ed9b2da8e28f6199 100644 (file)
--- 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 79a49bc052acdeb2f032f55be64f67289075e348..144161b6378c42dd73a6e4d9bd7bc3031e433ecf 100644 (file)
--- 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
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /