diff options
| author | Bruce Momjian <bruce@momjian.us> | 2012-03-17 09:56:47 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2012-03-17 09:56:56 -0400 |
| commit | ced53c38d7a05694bc316229e2332aebd98388aa (patch) | |
| tree | 484ebdc6d6b726c4c8bef515c66c3b361c113bdf | |
| parent | 313d29f740ef92e25f2e7707c61697471d22ca1b (diff) | |
| download | postgresql-ced53c38d7a05694bc316229e2332aebd98388aa.tar.gz postgresql-ced53c38d7a05694bc316229e2332aebd98388aa.zip | |
In pg_upgrade, move new echo quote define into include file.
| -rw-r--r-- | contrib/pg_upgrade/check.c | 5 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 9fbfd400dce..4b716b6721e 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -23,11 +23,6 @@ static void check_for_reg_data_type_usage(ClusterInfo *cluster); static void check_for_support_lib(ClusterInfo *cluster); static void get_bin_version(ClusterInfo *cluster); -#ifndef WIN32 -#define ECHO_QUOTE "'" -#else -#define ECHO_QUOTE "" -#endif void output_check_banner(bool *live_check) diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index da372494b4c..c1925cfe7f5 100644 --- a/contrib/pg_upgrade/pg_upgrade.h +++ b/contrib/pg_upgrade/pg_upgrade.h @@ -63,6 +63,7 @@ extern char *output_files[]; #define SERVER_LOG_FILE2 UTILITY_LOG_FILE #endif + #ifndef WIN32 #define pg_copy_file copy_file #define pg_mv_file rename @@ -70,6 +71,7 @@ extern char *output_files[]; #define RM_CMD "rm -f" #define RMDIR_CMD "rm -rf" #define SCRIPT_EXT "sh" +#define ECHO_QUOTE "'" #else #define pg_copy_file CopyFile #define pg_mv_file pgrename @@ -79,6 +81,7 @@ extern char *output_files[]; #define RMDIR_CMD "RMDIR /s/q" #define SCRIPT_EXT "bat" #define EXE_EXT ".exe" +#define ECHO_QUOTE "" #endif #define CLUSTER_NAME(cluster) ((cluster) == &old_cluster ? "old" : \ |